diff options
author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 14:34:02 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 22:29:41 +0100 |
commit | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch) | |
tree | 85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/libraries/libkipi | |
parent | 87e57a1a070839a44db16a0410ef57902db2df3e (diff) | |
download | tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip |
RPM: massive update and cleanup
Diffstat (limited to 'redhat/libraries/libkipi')
-rw-r--r-- | redhat/libraries/libkipi/libkipi-3.5.13.2.spec | 167 | ||||
-rw-r--r-- | redhat/libraries/libkipi/libkipi.spec (renamed from redhat/libraries/libkipi/libkipi-14.0.0.spec) | 73 |
2 files changed, 41 insertions, 199 deletions
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec deleted file mode 100644 index 740aea3b1..000000000 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ /dev/null @@ -1,167 +0,0 @@ -# Default version for this component -%define tde_pkg libkipi -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity] - -Epoch: 1 -Version: 0.1.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -%if 0%{?suse_version} -BuildRequires: liblcms-devel -%else -BuildRequires: lcms-devel -%endif -BuildRequires: libjpeg-devel -BuildRequires: pkgconfig -BuildRequires: gettext - -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -%description -Libkipi is a library - o that contains common routines and widget used by kipi-plugins - o to ease implementation of the kipi-plugins interface in an application - that wants to use kipi-plugins - -Homepage: http://www.kipi-plugins.org/ - - -%package devel -Group: Development/Libraries -Summary: library for apps that want to use kipi-plugins (development version) [Trinity] -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -Libkipi is a library - o that contains common routines and widget used by kipi-plugins - o to ease implementation of the kipi-plugins interface in an application - that wants to use kipi-plugins - -This package contains development files and documentation for libkipi library. -Homepage: http://www.kipi-plugins.org/ - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%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 || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_libdir}/libkipi.so.0 -%{tde_libdir}/libkipi.so.0.1.1 -%{tde_datadir}/apps/kipi/ -%{tde_datadir}/icons/hicolor/*/apps/kipi.png -%{tde_datadir}/servicetypes/kipiplugin.desktop - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/libkipi.so -%{tde_libdir}/libkipi.la -%{tde_tdeincludedir}/libkipi/ -%{tde_libdir}/pkgconfig/libkipi.pc - -%changelog diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi.spec index 010aafa52..b4be8c16e 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libkipi %define tde_prefix /opt/trinity @@ -82,14 +82,17 @@ BuildRequires: lcms-devel # JPEG support BuildRequires: libjpeg-devel -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# CMAKE +BuildRequires: cmake >= 2.8 %description Libkipi is a library @@ -161,37 +164,46 @@ Homepage: http://www.kipi-plugins.org/ %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} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --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_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DSERVICETYPES_INSTALL_DIR="%{tde_datadir}/servicetypes" \ + -DICON_INSTALL_DIR="%{tde_datadir}/icons" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -200,7 +212,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} - - - %changelog |