RPM: switch many packages to cmake

pull/14/head
François Andriot 5 years ago
parent 75c851fb86
commit d6f47b905e

@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -94,39 +94,44 @@ interface for the task of file management.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
fi
%configure \ %cmake \
--prefix=%{tde_prefix} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--exec-prefix=%{tde_prefix} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--bindir=%{tde_bindir} \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--datadir=%{tde_datadir} \ -DCMAKE_SKIP_RPATH=OFF \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
--docdir=%{tde_tdedocdir} \ -DCMAKE_VERBOSE_MAKEFILE=ON \
--libdir=%{tde_libdir} \ -DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
@ -161,6 +166,7 @@ fi
%{tde_tdeappdir}/d3lphin.desktop %{tde_tdeappdir}/d3lphin.desktop
%{tde_datadir}/apps/d3lphin/ %{tde_datadir}/apps/d3lphin/
%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
%{tde_mandir}/man1/*.1*
%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -95,38 +95,45 @@ inspired by Quicksilver for OS X.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -194,6 +201,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_datadir}/services/katapult_spellcatalog.desktop %{tde_datadir}/services/katapult_spellcatalog.desktop
%{tde_datadir}/servicetypes/katapultcatalog.desktop %{tde_datadir}/servicetypes/katapultcatalog.desktop
%{tde_datadir}/servicetypes/katapultdisplay.desktop %{tde_datadir}/servicetypes/katapultdisplay.desktop
%{tde_mandir}/man1/*.1*
%{tde_tdedocdir}/HTML/en/katapult/ %{tde_tdedocdir}/HTML/en/katapult/

@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -119,6 +119,7 @@ to use them in another application.
%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png %{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png %{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png %{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
%{tde_mandir}/man1/*.1*
%{tde_tdedocdir}/HTML/en/kbarcode/ %{tde_tdedocdir}/HTML/en/kbarcode/
########## ##########
@ -148,41 +149,47 @@ Group: Applications/Utilities
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-new-ldflags \ -DWITH_NATIVE_GNU_BARCODE=OFF \
--enable-final \ -DWITH_JAVASCRIPT=ON \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\ \
--with-extra-includes=%{_includedir}/pcre -DBUILD_ALL=ON \
-DBUILD_DOC=ON \
-DBUILD_TRANSLATIONS=ON \
..
# SMP safe ! %__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -96,42 +96,44 @@ KBibTeX is released under the GNU Public License (GPL) version2 or any later
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Warning: --enable-final causes FTBFS
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--datadir=%{tde_datadir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-new-ldflags \ \
--disable-final \ -DBUILD_ALL=ON \
--enable-closure \ -DBUILD_DOC=ON \
--enable-rpath \ -DBUILD_TRANSLATIONS=ON \
--disable-gcc-hidden-visibility ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build
# Useless files ..
%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -64,7 +64,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -97,38 +97,44 @@ NNTP mailboxes.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--mandir=%{tde_mandir} \
--datadir=%{tde_datadir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -62,7 +62,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -94,38 +94,44 @@ within the Trinity Desktop Environment.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
# Fix desktop icon location # Fix desktop icon location
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -94,38 +94,45 @@ Requires: trinity-tdebase >= %{tde_version}
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang autostart %find_lang autostart

@ -67,7 +67,7 @@ BuildRequires: trinity-libtdeldap-devel >= 0.5
Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -168,15 +168,8 @@ This is a small daemon which keeps the LDAP root certificate up to date with the
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
extra_includes="%{_includedir}" extra_includes="%{_includedir}"
extra_libs="%{_libdir}" extra_libs="%{_libdir}"
@ -190,33 +183,43 @@ if [ -d "%{_includedir}/heimdal" ]; then
extra_libs="%{_libdir}/heimdal:${extra_libs}" extra_libs="%{_libdir}/heimdal:${extra_libs}"
fi fi
%configure \ unset QTDIR QTINC QTLIB
--prefix=%{tde_prefix} \ export PATH="%{tde_bindir}:${PATH}"
--exec-prefix=%{tde_prefix} \ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--includedir=%{tde_tdeincludedir} \ %__mkdir_p build
--docdir=%{tde_tdedocdir} \ cd build
--libdir=%{tde_libdir} \ fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\ \
--with-extra-includes=${extra_includes} \ -DBUILD_ALL=ON \
--with-extra-libs=${extra_libs} \ -DBUILD_DOC=ON \
-DBUILD_TRANSLATIONS=ON \
..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean

@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -98,38 +98,45 @@ KCPULoad has support for SMP and separate user/system loads.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
# Fix desktop icon location # Fix desktop icon location
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
@ -153,6 +160,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_datadir}/apps/kcpuload/ %{tde_datadir}/apps/kcpuload/
%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png %{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
%{tde_datadir}/icons/locolor/*/apps/kcpuload.png %{tde_datadir}/icons/locolor/*/apps/kcpuload.png
%{tde_mandir}/man1/*.1*
%{tde_tdedocdir}/HTML/en/kcpuload/ %{tde_tdedocdir}/HTML/en/kcpuload/

@ -61,7 +61,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -100,40 +100,45 @@ own cleanup actions.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \ %cmake \
--mandir=%{tde_mandir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-new-ldflags \ \
--enable-final \ -DBUILD_ALL=ON \
--enable-closure \ -DBUILD_DOC=ON \
--enable-rpath \ -DBUILD_TRANSLATIONS=ON \
--disable-gcc-hidden-visibility ..
# SMP safe ! %__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -161,6 +166,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdedocdir}/HTML/en/kdirstat/ %{tde_tdedocdir}/HTML/en/kdirstat/
%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png %{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
%{tde_datadir}/icons/locolor/*/apps/kdirstat.png %{tde_datadir}/icons/locolor/*/apps/kdirstat.png
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -99,34 +99,33 @@ directly - they must be converted to a Kexi database first.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
--libdir=%{tde_libdir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--mandir=%{tde_mandir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\ \
--disable-dependency-tracking \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
--disable-debug \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
--enable-new-ldflags \ -DLIB_INSTALL_DIR="%{tde_libdir}" \
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\ \
--with-kexidb-libraries=%{tde_libdir} -DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -64,7 +64,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -97,40 +97,45 @@ groups of users.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
--libdir=%{tde_libdir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--mandir=%{tde_mandir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \ %__make %{?_smp_mflags} || %__make
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -158,8 +163,15 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%{tde_bindir}/kiosktool-tdedirs %{tde_bindir}/kiosktool-tdedirs
%{tde_tdeappdir}/kiosktool.desktop %{tde_tdeappdir}/kiosktool.desktop
%{tde_datadir}/apps/kiosktool/ %{tde_datadir}/apps/kiosktool/
%{tde_tdedocdir}/HTML/en/kiosktool/ %lang(da) %{tde_tdedocdir}/HTML/da/kiosktool/
%lang(en) %{tde_tdedocdir}/HTML/en/kiosktool/
%lang(it) %{tde_tdedocdir}/HTML/it/kiosktool/
%lang(nl) %{tde_tdedocdir}/HTML/nl/kiosktool/
%lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/
%lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/
%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png %{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
%{tde_confdir}/kiosktoolrc %{tde_confdir}/kiosktoolrc
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -101,40 +101,45 @@ Features include:
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Warning: --enable-final causes FTBFS !
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \ %cmake \
--mandir=%{tde_mandir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--disable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -162,6 +167,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons %{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons
%{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_options %{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_options
%{tde_datadir}/autostart/kkbswitch.desktop %{tde_datadir}/autostart/kkbswitch.desktop
%{tde_datadir}/X11/xkb/symbols/ru_ua
%{tde_tdedocdir}/HTML/en/kkbswitch/ %{tde_tdedocdir}/HTML/en/kkbswitch/
%{tde_mandir}/man1/kkbswitch.1 %{tde_mandir}/man1/kkbswitch.1
%{tde_datadir}/icons/hicolor/*/apps/kkbswitch.png %{tde_datadir}/icons/hicolor/*/apps/kkbswitch.png

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -92,40 +92,45 @@ BuildRequires: brp-check-trinity
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Warning: --enable-final causes FTBFS !
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \ %cmake \
--mandir=%{tde_mandir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--disable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean
@ -135,8 +140,8 @@ export PATH="%{tde_bindir}:${PATH}"
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING LICENSE NEWS README %doc AUTHORS COPYING LICENSE NEWS README
%{tde_libdir}/klcddimmer_panelapplet.la %{tde_libdir}/libklcddimmer_panelapplet.la
%{tde_libdir}/klcddimmer_panelapplet.so %{tde_libdir}/libklcddimmer_panelapplet.so
%{tde_datadir}/apps/kicker/applets/klcddimmer.desktop %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
%{tde_tdedocdir}/HTML/en/klcddimmer/ %{tde_tdedocdir}/HTML/en/klcddimmer/
%{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png %{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -99,40 +99,45 @@ KNetLoad can monitor just about any network device.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
# SMP safe ! %__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -144,7 +149,7 @@ export PATH="%{tde_bindir}:${PATH}"
# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'. # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48}"/apps/" %__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48}"/apps/"
pushd "%{?buildroot}%{tde_datadir}/icons" pushd "%{?buildroot}%{tde_datadir}/icons"
for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/knetload.png hicolor/"$i"x"$i"/apps/knetload.png ;done for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/knetload.png hicolor/"$i"x"$i"/apps/knetload.png ;done
popd popd
@ -161,6 +166,7 @@ popd
%{tde_datadir}/icons/hicolor/*/apps/knetload.png %{tde_datadir}/icons/hicolor/*/apps/knetload.png
%{tde_datadir}/icons/locolor/*/apps/knetload.png %{tde_datadir}/icons/locolor/*/apps/knetload.png
%{tde_tdedocdir}/HTML/en/knetload/ %{tde_tdedocdir}/HTML/en/knetload/
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -94,40 +94,45 @@ network interface on a system tray icon
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
# SMP safe ! %__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -106,40 +106,45 @@ Here's a quick list of Knights' key features:
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Warning: --enable-final causes FTBFS
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \ %cmake \
--mandir=%{tde_mandir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--disable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -156,6 +161,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdedocdir}/HTML/*/knights %{tde_tdedocdir}/HTML/*/knights
%{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/mimelnk/application/pgn.desktop %{tde_datadir}/mimelnk/application/pgn.desktop
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -62,7 +62,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -108,37 +108,44 @@ http://www.kde-apps.org/content/show.php?content=31108
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-new-ldflags \ \
--enable-final \ -DBUILD_ALL=ON \
--enable-closure \ -DBUILD_DOC=ON \
--enable-rpath \ -DBUILD_TRANSLATIONS=ON \
--disable-gcc-hidden-visibility ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build
# Move desktop icon to XDG directory # Move desktop icon to XDG directory
%__mkdir_p %{buildroot}%{tde_tdeappdir} %__mkdir_p %{buildroot}%{tde_tdeappdir}
@ -180,6 +187,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/*/apps/zoomcustom.png %{tde_datadir}/icons/hicolor/*/apps/zoomcustom.png
%{tde_datadir}/icons/hicolor/*/apps/zoomin.png %{tde_datadir}/icons/hicolor/*/apps/zoomin.png
%{tde_datadir}/icons/hicolor/*/apps/zoomout.png %{tde_datadir}/icons/hicolor/*/apps/zoomout.png
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -99,39 +99,45 @@ stations using an UPS.
# Fix permissions # Fix permissions
chmod 644 AUTHORS README TODO COPYING ChangeLog chmod 644 AUTHORS README TODO COPYING ChangeLog
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-new-ldflags \ \
--enable-final \ -DBUILD_ALL=ON \
--enable-closure \ -DBUILD_DOC=ON \
--enable-rpath \ -DBUILD_TRANSLATIONS=ON \
--disable-gcc-hidden-visibility ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -154,5 +160,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdedocdir}/HTML/en/knutclient %{tde_tdedocdir}/HTML/en/knutclient
%{tde_datadir}/icons/hicolor/*/apps/*.png %{tde_datadir}/icons/hicolor/*/apps/*.png
%{tde_datadir}/icons/locolor/*/apps/*.png %{tde_datadir}/icons/locolor/*/apps/*.png
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -125,39 +125,45 @@ and experienced users alike will appreciate its many features:
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -110,44 +110,51 @@ and synchronize the built-in applications with their TDE counterparts.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
# SMP safe ! %__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
# Unwanted files # Unwanted files
%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %if 0%{?suse_version}
@ -156,12 +163,11 @@ export PATH="%{tde_bindir}:${PATH}"
%endif %endif
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/kpalmdoc %{tde_bindir}/kpalmdoc
%{tde_bindir}/kpilot %{tde_bindir}/kpilot
@ -201,9 +207,9 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/config.kcfg/*.kcfg %{tde_datadir}/config.kcfg/*.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/*.png %{tde_datadir}/icons/crystalsvg/*/apps/*.png
%{tde_datadir}/icons/hicolor/*/apps/*.png %{tde_datadir}/icons/hicolor/*/apps/*.png
%{tde_datadir}/icons/locolor/*/apps/*.png
%{tde_datadir}/services/*.desktop %{tde_datadir}/services/*.desktop
%{tde_datadir}/servicetypes/kpilotconduit.desktop %{tde_datadir}/servicetypes/kpilotconduit.desktop
%{tde_tdedocdir}/HTML/en/kpilot/ %{tde_tdedocdir}/HTML/en/kpilot/
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -104,38 +104,44 @@ temperatures with KSensors.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Warning: --enable-final causes FTBFS
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--disable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build
# Move desktop icon to correct location # Move desktop icon to correct location
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
@ -167,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/locolor/*/apps/ksensors.png %{tde_datadir}/icons/locolor/*/apps/ksensors.png
%{tde_datadir}/sounds/ksensors_alert.wav %{tde_datadir}/sounds/ksensors_alert.wav
%{tde_tdedocdir}/HTML/en/ksensors/ %{tde_tdedocdir}/HTML/en/ksensors/
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -100,38 +100,44 @@ and sounds.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--htmldir=%{tde_tdedocdir}/HTML \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -159,6 +165,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.des
%{tde_datadir}/icons/hicolor/*/apps/kshutdown.png %{tde_datadir}/icons/hicolor/*/apps/kshutdown.png
%lang(de) %{tde_datadir}/doc/tde/HTML/de/kshutdown/ %lang(de) %{tde_datadir}/doc/tde/HTML/de/kshutdown/
%lang(en) %{tde_datadir}/doc/tde/HTML/en/kshutdown/ %lang(en) %{tde_datadir}/doc/tde/HTML/en/kshutdown/
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -107,39 +107,45 @@ Homepage: http://moodwrod.com
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -93,40 +93,46 @@ a systray widget as well as a dockwidget.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\
-DBUILD_ALL=ON \
-DBUILD_DOC=ON \
-DBUILD_TRANSLATIONS=ON \
..
%__make %{?_smp_mflags} || %__make
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-final \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
# Move desktop file to XDG location # Move desktop file to XDG location
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"

@ -63,7 +63,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -104,38 +104,45 @@ It supports :
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .installdir %patch0 -p1 -b .installdir
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-final \ \
--enable-new-ldflags \ -DBUILD_ALL=ON \
--enable-closure \ -DBUILD_DOC=ON \
--enable-rpath \ -DBUILD_TRANSLATIONS=ON \
--disable-gcc-hidden-visibility ..
%__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -153,12 +160,12 @@ export PATH="%{_bindir}:${PATH}"
%lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/ %lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/
%lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/ %lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/
%lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kvpnc/ %lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kvpnc/
%{tde_datadir}/doc/tde/HTML/kvpnc/
%lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/ %lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
%{tde_datadir}/icons/hicolor/*/apps/kvpnc.png %{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
%{tde_datadir}/icons/locolor/*/apps/kvpnc.png %{tde_datadir}/icons/locolor/*/apps/kvpnc.png
%{tde_tdedocdir}/HTML/en/tdeioslave/pcf/ %{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
%{tde_datadir}/services/pcf.protocol %{tde_datadir}/services/pcf.protocol
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -102,38 +102,44 @@ is the image, and dropping bad frames.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--htmldir=%{tde_tdedocdir}/HTML \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT %__make install DESTDIR=%{buildroot} -C build
%clean %clean

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -95,39 +95,45 @@ remote files (web, ftp, ...) is also supported.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\ \
--disable-dependency-tracking \ -DWITH_ALL_OPTIONS=ON \
--disable-debug \ -DWITH_GCC_VISIBILITY=ON \
--enable-final \ \
--enable-new-ldflags \ -DBUILD_ALL=ON \
--enable-closure \ -DBUILD_DOC=ON \
--enable-rpath \ -DBUILD_TRANSLATIONS=ON \
--disable-gcc-hidden-visibility ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
# Move desktop file to XDG location # Move desktop file to XDG location
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
@ -153,6 +159,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png %{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png
%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png %{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -91,32 +91,37 @@ Tasty Menu is a TMenu replacement aiming to provide the maximum usability and fl
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \ if ! rpm -E %%cmake|grep -q "cd build"; then
--prefix=%{tde_prefix} \ %__mkdir_p build
--exec-prefix=%{tde_prefix} \ cd build
--bindir=%{tde_bindir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
--libdir=%{tde_libdir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--mandir=%{tde_mandir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
@ -124,7 +129,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}

@ -60,7 +60,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -81,38 +81,44 @@ Mandriva theme for Trinity
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \ %cmake \
--mandir=%{tde_mandir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_TRANSLATIONS=ON \
--enable-final \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{?buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -96,37 +96,44 @@ most server implementations.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%files %files

@ -66,7 +66,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -106,41 +106,44 @@ ioslave, providing the sword:/ protocol.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--libdir=%{tde_libdir} \ fi
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\ \
--disable-dependency-tracking \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
--disable-debug \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
--enable-final \ -DLIB_INSTALL_DIR="%{tde_libdir}" \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\ \
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 -DWITH_ALL_OPTIONS=ON \
--with-sword-dir=%{tde_prefix} -DWITH_GCC_VISIBILITY=ON \
%endif \
-DBUILD_ALL=ON \
-DBUILD_DOC=ON \
-DBUILD_TRANSLATIONS=ON \
..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%files %files

@ -65,7 +65,7 @@ BuildRequires: desktop-file-utils
Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} Obsoletes: trinity-kio-umountwrapper < %{version}-%{release}
Provides: trinity-kio-umountwrapper = %{version}-%{release} Provides: trinity-kio-umountwrapper = %{version}-%{release}
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -98,39 +98,45 @@ Provides a progress dialog for Safely Removing of devices in Trinity.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
fi
%configure \ %cmake \
--prefix=%{tde_prefix} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--exec-prefix=%{tde_prefix} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--bindir=%{tde_bindir} \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--datadir=%{tde_datadir} \ -DCMAKE_SKIP_RPATH=OFF \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
--libdir=%{tde_libdir} \ -DCMAKE_VERBOSE_MAKEFILE=ON \
--mandir=%{tde_mandir} \ -DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
%__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -98,38 +98,45 @@ It allows you to run programs as another user by entering your password.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--docdir=%{tde_docdir} \
--includedir=%{tde_tdeincludedir} \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -142,6 +149,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/tdesudo %{tde_bindir}/tdesudo
%{tde_tdedocdir}/HTML/en/tdesudo/ %{tde_tdedocdir}/HTML/en/tdesudo/
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -95,39 +95,45 @@ that allows you to easily install, remove and change your TDM themes.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \ %cmake \
--mandir=%{tde_mandir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean

@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -90,39 +90,45 @@ Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_GCC_VISIBILITY=ON \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-final \ -DBUILD_TRANSLATIONS=ON \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean
@ -139,6 +145,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/locale/*/*/*.mo %{tde_datadir}/locale/*/*/*.mo
%{tde_datadir}/config.kcfg/*.kcfg %{tde_datadir}/config.kcfg/*.kcfg
%{tde_tdedocdir}/HTML/en/yakuake/ %{tde_tdedocdir}/HTML/en/yakuake/
%{tde_mandir}/man1/*.1*
%changelog %changelog

@ -72,10 +72,8 @@ Provides: trinity-kdeadmin = %{version}-%{release}
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: autoconf BuildRequires: cmake >= 2.8
BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
BuildRequires: m4
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -339,46 +337,57 @@ touch /etc/lilo.conf
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTLIB QTINC unset QTDIR QTLIB QTINC
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}"
# Specific path for RHEL4 if ! rpm -E %%cmake|grep -q "cd build"; then
if [ -d /usr/X11R6 ]; then %__mkdir_p build
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" cd build
fi fi
%configure \ %cmake \
--prefix=%{tde_prefix} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--exec-prefix=%{tde_prefix} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--bindir=%{tde_bindir} \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--sbindir=%{tde_sbindir} \ -DCMAKE_SKIP_RPATH=OFF \
--libdir=%{tde_libdir} \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
--datadir=%{tde_datadir} \ -DCMAKE_VERBOSE_MAKEFILE=ON \
--includedir=%{tde_tdeincludedir} \ -DWITH_GCC_VISIBILITY=OFF \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DBUILD_DOC=ON \
--enable-new-ldflags \ -DBUILD_KCRON=ON \
--enable-final \ -DBUILD_KDAT=ON \
--enable-closure \ -DBUILD_KNETWORKCONF=ON \
--enable-rpath \ -DBUILD_KPACKAGE=ON \
--disable-gcc-hidden-visibility \ -DBUILD_KSYSV=ON \
-DBUILD_KUSER=ON \
-DBUILD_LILO_CONFIG=ON \
-DBUILD_SECPOLICY=ON \
-DBUILD_TDEFILE_PLUGINS=ON \
\ \
--with-rpm \
--with-pam=kde \
--with-shadow \
--with-private-groups \
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
--with-first-uid=1000 \ -DKU_FIRSTUID="1000" \
--with-first-gid=1000 \ -DKU_FIRSTGID="1000" \
%endif %endif
-DKU_USERPRIVATEGROUP=false \
-DKU_HOMEDIR_PERM="0700" \
-DKU_HOMETEMPLATE="/home/%U" \
-DKU_MAILBOX_GID="0" \
-DKU_MAILBOX_PERM="0660" \
\
..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
@ -386,7 +395,7 @@ fi
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
comps="kcron kdat knetworkconf kpackage ksysv kuser" comps="kcron kdat knetworkconf kpackage ksysv kuser"
%__mkdir_p %{buildroot}%{tde_datadir}/config \ %__mkdir_p %{buildroot}%{tde_datadir}/config \

Loading…
Cancel
Save