From 472a95e30a3c05be3faa1d42877bc2fb3a50d86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 6 Aug 2013 22:53:07 +0200 Subject: RPM Packaging: update lots of libraries --- redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec | 39 +++++++++++++++--------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec') diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec index 26058fe71..6213ea369 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec @@ -1,5 +1,6 @@ # Default version for this component -%define kdecomp libkexiv2 +%define tde_pkg libkexiv2 +%define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -14,7 +15,7 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -22,10 +23,11 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] -Version: 14.0.0 +Epoch: 1 +Version: 0.1.7 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -38,10 +40,10 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -73,7 +75,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %package devel Group: Development/Libraries Summary: Qt like interface for the libexiv2 library (development) [Trinity] -Requires: %{name} = %{version} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel libkexif2-devel contains development files and documentation for libkexiv2 @@ -87,7 +89,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %prep -%setup -q -n %{name}-%{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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -95,16 +97,23 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %build -unset QTDIR +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -150,5 +159,5 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog -* Mon Jun 03 2013 Francois Andriot - 14.0.0-1 +* Fri Jul 05 2013 Francois Andriot - 0.1.7-1 - Initial release for TDE 14.0.0 -- cgit v1.2.1