RPM: merge redhat directory with master branch

3 files changed, 6 insertions, 36 deletions

diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec
index ee835164b..fa35b7738 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec
@@ -1,8 +1,3 @@
-# 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
-
 # Speed build options
 %define debug_package %{nil}
 %define __spec_install_post %{nil}
@@ -27,7 +22,7 @@ AutoReq: no
 Name:			trinity-kickoff-i18n
 Summary:		Kickoff translations for Trinity Desktop Environment
 Version:		1.0
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 Group:			System/Internationalization
 License:		GPL
 URL:			http://www.mandriva.com
@@ -64,7 +59,7 @@ kickoff translations
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
 
 
@@ -94,8 +89,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec
index a0e684814..fbf315bb9 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# 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
-
 # Speed build options
 %define debug_package %{nil}
 %define __spec_install_post %{nil}
@@ -27,7 +22,7 @@ AutoReq: no
 Name:			trinity-kickoff-i18n
 Summary:		Kickoff translations for Trinity Desktop Environment
 Version:		1.0
-Release:	3%{?dist}%{?_variant}
+Release:	3%{?dist}
 Group:			System/Internationalization
 License:		GPL
 URL:			http://www.mandriva.com
@@ -64,7 +59,7 @@ kickoff translations
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
 
 
@@ -94,11 +89,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %defattr(-,root,root,-)
 
 %changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec
index eb4540bd2..426fead6a 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec
@@ -1,8 +1,3 @@
-# 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
-
 # Speed build options
 %define debug_package %{nil}
 %define __spec_install_post %{nil}
@@ -19,7 +14,7 @@ AutoReq: no
 Name:			trinity-kickoff-i18n
 Summary:		Kickoff translations for Trinity Desktop Environment
 Version:		1.0
-Release:		1%{?dist}%{?_variant}
+Release:		1%{?dist}
 Group:			System/Internationalization
 License:		GPL
 URL:			http://www.mandriva.com
@@ -56,7 +51,7 @@ kickoff translations
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
 
 
@@ -85,5 +80,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 %defattr(-,root,root,-)
 
 %changelog
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13