diff options
| -rw-r--r-- | redhat/applications/tork/tork.spec | 58 |
1 files changed, 34 insertions, 24 deletions
diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/tork/tork.spec index 74681c379..bbf085d76 100644 --- a/redhat/applications/tork/tork.spec +++ b/redhat/applications/tork/tork.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -100,39 +100,40 @@ on the Tor network. %prep %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 unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -# NOTICE: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --mandir=%{tde_mandir} \ - --program-prefix="" \ +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}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -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 \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + \ + .. + %__make %{?_smp_mflags} %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %find_lang %{tde_pkg} @@ -147,6 +148,16 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/tork %{tde_bindir}/torkarkollon %{tde_bindir}/usewithtor +%{tde_tdelibdir}/kickermenu_tork.la +%{tde_tdelibdir}/kickermenu_tork.so +%{tde_tdelibdir}/tdehtml_tork.la +%{tde_tdelibdir}/tdehtml_tork.so +%{tde_tdelibdir}/tdeio_torioslave.la +%{tde_tdelibdir}/tdeio_torioslave.so +%{tde_tdeappdir}/tork_plug_in.desktop +%{tde_datadir}/apps/kicker/menuext/torkmenu.desktop +%{tde_datadir}/apps/tdehtml/kpartplugins/tork_plug_in.rc +%{tde_datadir}/services/torioslave.protocol %{tde_tdeappdir}/tork.desktop %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop @@ -154,7 +165,6 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/tork/ %{tde_datadir}/config.kcfg/torkconfig.kcfg %{tde_tdedocdir}/HTML/en/tork/ -%{tde_datadir}/icons/hicolor/*/actions/tork.png %{tde_datadir}/icons/hicolor/*/apps/tork.png %dir %{tde_datadir}/menu %{tde_datadir}/menu/tork |