diff options
| -rw-r--r-- | redhat/applications/knowit/knowit.spec (renamed from redhat/applications/knowit/knowit-14.0.0.spec) | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit.spec index ae97cad85..67cac8595 100644 --- a/redhat/applications/knowit/knowit-14.0.0.spec +++ b/redhat/applications/knowit/knowit.spec @@ -61,11 +61,20 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -95,45 +104,37 @@ but TDE-based, and requires Trinity. %prep %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 unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -# SMP safe ! + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DBUILD_ALL=ON \ + .. + %__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__mkdir_p %{buildroot}%{tde_tdeappdir} -%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop -%__rm -r %{buildroot}%{tde_datadir}/applnk +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -152,8 +153,9 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/knowit %{tde_tdeappdir}/knowit.desktop %{tde_datadir}/apps/knowit/ -%{tde_tdedocdir}/HTML/en/knowit/ %{tde_datadir}/icons/hicolor/*/apps/knowit.png - +%{tde_datadir}/mimelnk/application/x-knowit.desktop +%{tde_tdedocdir}/HTML/en/knowit/ +%{tde_mandir}/man*/knowit.* %changelog |