diff options
| author | François Andriot <albator78@libertysurf.fr> | 2020-04-14 12:07:03 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2020-04-23 10:32:08 +0200 |
| commit | 4a082768066b2b3ac46d6aaa2f6954be6e021d1b (patch) | |
| tree | ccaaf127e407feaed165c8d59d6bd995a5b84853 /redhat/applications/tdeio-apt | |
| parent | edc1bf4a4939ceb6ce016e01c8fb5b81a800eb96 (diff) | |
| download | tde-packaging-4a082768066b2b3ac46d6aaa2f6954be6e021d1b.tar.gz tde-packaging-4a082768066b2b3ac46d6aaa2f6954be6e021d1b.zip | |
RPM: various updates for TDE 14.0.8
Diffstat (limited to 'redhat/applications/tdeio-apt')
| -rw-r--r-- | redhat/applications/tdeio-apt/tdeio-apt.spec | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index 041304b19..ae1fdc218 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -60,11 +60,17 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -97,39 +103,43 @@ browsing the packages easier. It provides: %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}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} |