rpms/gettext/F-13 .cvsignore, 1.15, 1.16 gettext.spec, 1.104, 1.105 sources, 1.16, 1.17 gettext-0.17-autopoint-CVS-441481.patch, 1.1, NONE gettext-0.17-long-long-int-m4.patch, 1.1, NONE gettext-0.17-open-args.patch, 1.1, NONE gettext-0.17-rpathFix.patch, 1.3, NONE gettext-xgettext-python-unicode-surrogate-473946.patch, 1.1, NONE

Fri Jun 11 05:49:01 UTC 2010

Author: petersen

Update of /cvs/pkgs/rpms/gettext/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18161

Modified Files:
	.cvsignore gettext.spec sources 
Removed Files:
	gettext-0.17-autopoint-CVS-441481.patch 
	gettext-0.17-long-long-int-m4.patch 
	gettext-0.17-open-args.patch gettext-0.17-rpathFix.patch 
	gettext-xgettext-python-unicode-surrogate-473946.patch 
Log Message:
backport 0.18:
- update to 0.18.1.1 release (#591044)
- gettext-0.17-autopoint-CVS-441481.patch, gettext-0.17-long-long-int-m4.patch
  gettext-0.17-open-args.patch, and
  gettext-xgettext-python-unicode-surrogate-473946.patch are upstream
- use chrpath to avoid multilib rpath hell instead of complicated libtool hacks




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-13/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16

--- .cvsignore	24 Jan 2008 07:37:30 -0000	1.15
+++ .cvsignore	11 Jun 2010 05:49:00 -0000	1.16
@@ -1 +1 @@
-gettext-0.17.tar.gz
+gettext-0.18.1.1.tar.gz


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-13/gettext.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gettext.spec	27 May 2010 09:24:54 -0000	1.104
+++ gettext.spec	11 Jun 2010 05:49:00 -0000	1.105
@@ -4,8 +4,8 @@
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
-Version: 0.17
-Release: 16.2%{?dist}
+Version: 0.18.1.1
+Release: 0.1%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -28,16 +28,12 @@ BuildRequires: zip, unzip
 %endif
 # need expat for xgettext on glade
 Buildrequires: expat-devel
+BuildRequires: chrpath
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # for autopoint:
 Requires: cvs
 Requires(post): info
 Requires(preun): info
-Patch5: gettext-0.17-open-args.patch
-Patch6: gettext-0.17-autopoint-CVS-441481.patch
-Patch7: gettext-0.17-rpathFix.patch
-Patch8: gettext-xgettext-python-unicode-surrogate-473946.patch
-Patch9: gettext-0.17-long-long-int-m4.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -80,35 +76,25 @@ This package contains libraries used int
 
 %prep
 %setup -q
-%patch5 -p0 -b .5-open-args~
-%patch6 -p0 -b .6-autopoint~
-%patch7 -p0 -b .rpathFix~
-%patch8 -p0 -b .unicode~
-%patch9 -p0 -b .longlong~
-
-# necessary for autoconf >= 2.6.2:
-rm gettext-tools/gnulib-m4/openmp.m4
-
-./autogen.sh --quick --skip-gnulib
 
 
 %build
-[ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
-
 %if %{with java}
 export JAVAC=gcj
 %if %{with jar}
 export JAR=fastjar
 %endif
 %endif
+# --disable-rpath doesn't work properly on lib64
 %configure --without-included-gettext --enable-nls --disable-static \
-    --enable-shared --with-pic-=yes --disable-csharp \
+    --enable-shared --with-pic-=yes --disable-csharp --disable-rpath \
 %if %{with java}
     --enable-java \
 %else
     --disable-java --disable-native-java \
 %endif
-    --disable-rpath
+%{nil}
+
 make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
 
 
@@ -169,6 +155,13 @@ rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 %find_lang %{name}-tools
 cat %{name}-*.lang > %{name}.lang
 
+# cleanup rpaths
+for i in $RPM_BUILD_ROOT%{_bindir}/* `find $RPM_BUILD_ROOT%{_libdir} -type f`; do
+  if file $i | grep "ELF 64-bit" >/dev/null; then
+     chrpath -l $i && chrpath --delete $i
+  fi
+done
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -176,11 +169,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %if %{with check}
 %check
-## For Koji build problem
-cp  ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/src/.libs
-cp  ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/tests/.libs
-cp  ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/src/.libs
-cp  ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/tests/.libs
 # this takes quite a lot of time to run
 make check
 %endif
@@ -232,7 +220,7 @@ fi
 %exclude %{_libdir}/%{name}/gnu.gettext.*
 %endif
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/archive.tar.gz
+%{_datadir}/%{name}/archive.*.tar.gz
 %{_datadir}/%{name}/intl
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
@@ -263,15 +251,22 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libasprintf.so.*
-%{_libdir}/libgettextlib-%{version}.so
+%{_libdir}/libgettextlib-0.*.so
 %{_libdir}/libgettextpo.so.*
-%{_libdir}/libgettextsrc-%{version}.so
+%{_libdir}/libgettextsrc-0.*.so
 %if %{with jar}
 %{_datadir}/%{name}/libintl.jar
 %endif
 
 
 %changelog
+* Fri Jun 11 2010 Jens Petersen <petersen at redhat.com> - 0.18.1.1-0.1
+- update to 0.18.1.1 release (#591044)
+- gettext-0.17-autopoint-CVS-441481.patch, gettext-0.17-long-long-int-m4.patch
+  gettext-0.17-open-args.patch, and
+  gettext-xgettext-python-unicode-surrogate-473946.patch are upstream
+- use chrpath to avoid multilib rpath hell instead of complicated libtool hacks
+
 * Thu May 27 2010 Jens Petersen <petersen at redhat.com> - 0.17-16.2
 - move libintl.jar to lib subpackage to avoid multilib problems
   (reported by Jim Radford in #595922)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-13/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	24 Jan 2008 07:37:30 -0000	1.16
+++ sources	11 Jun 2010 05:49:00 -0000	1.17
@@ -1 +1 @@
-58a2bc6d39c0ba57823034d55d65d606  gettext-0.17.tar.gz
+3dd55b952826d2b32f51308f2f91aa89  gettext-0.18.1.1.tar.gz


--- gettext-0.17-autopoint-CVS-441481.patch DELETED ---


--- gettext-0.17-long-long-int-m4.patch DELETED ---


--- gettext-0.17-open-args.patch DELETED ---


--- gettext-0.17-rpathFix.patch DELETED ---


--- gettext-xgettext-python-unicode-surrogate-473946.patch DELETED ---

