RPM: merge redhat directory with master branch

2 files changed, 12 insertions, 40 deletions

diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
index d10f2ba1d..26a35fb11 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libkexiv2 (version R14.0.0)
+# spec file for package libkexiv2 (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libkexiv2
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,11 +36,6 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libkexiv %{_lib}kexiv
 %else
@@ -47,11 +44,11 @@
 
 
 Name:		trinity-%{tde_pkg}
-Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
-Group:		System/Libraries
 Epoch:		2
 Version:	0.1.7
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -115,12 +112,6 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %{tde_libdir}/libkexiv2.so.5
 %{tde_libdir}/libkexiv2.so.5.0.0
 
-%post -n trinity-%{libkexiv}2-5
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkexiv}2-5
-/sbin/ldconfig || :
-
 ##########
 
 %package -n trinity-%{libkexiv}2-devel
@@ -143,12 +134,6 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %{tde_tdeincludedir}/libkexiv2/
 %{tde_libdir}/pkgconfig/libkexiv2.pc
 
-%post -n trinity-%{libkexiv}2-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkexiv}2-devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -161,7 +146,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %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"
+%__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"
 
 
@@ -201,7 +186,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-2
-- Initial release for TDE 14.0.0
+%changelog
diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
index 03e4966ac..38f08646a 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg libkexiv2
 %define tde_version 3.5.13.2
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -28,7 +23,7 @@ Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
 
 Epoch:		1
 Version:	0.1.7
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Environment/Libraries
@@ -92,7 +87,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %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"
+%__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"
 
 
@@ -157,9 +152,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_libdir}/pkgconfig/libkexiv2.pc
 
 
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-1
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+%changelog