rpms/gettext/devel gettext.spec, 1.104, 1.105 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 04:43:58 UTC 2010

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12290

Modified Files:
	gettext.spec 
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:
- 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
- move libintl.jar to lib subpackage to avoid multilib problems
  (reported by Jim Radford in #595922)
- disable java for now
- use chrpath to get us out of rpath hell instead of complicated libtool hacks
- enable git support




Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105

--- gettext.spec	24 Apr 2010 05:50:57 -0000	1.104
+++ gettext.spec	11 Jun 2010 04:43:58 -0000	1.105
@@ -1,11 +1,11 @@
-%bcond_without jar
-%bcond_without java
+%bcond_with jar
+%bcond_with java
 %bcond_without check
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
-Version: 0.17
-Release: 17%{?dist}
+Version: 0.18.1.1
+Release: 1%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -30,16 +30,13 @@ BuildRequires: zip, unzip
 Buildrequires: expat-devel
 # for po-mode.el
 BuildRequires: emacs
+BuildRequires: git
+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
@@ -103,35 +100,25 @@ Emacs.
 
 %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
+    --enable-git
+
 make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
 
 
@@ -196,6 +183,13 @@ rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir
 %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}
@@ -203,11 +197,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
@@ -259,14 +248,10 @@ 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
-%if %{with jar}
-%{_datadir}/%{name}/libintl.jar
-%endif
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -294,9 +279,12 @@ 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
 
 %files -n emacs-%{name}
 %defattr(-,root,root,-)
@@ -309,6 +297,17 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Fri May 21 2010 Jens Petersen <petersen at redhat.com> - 0.18.1.1-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
+- move libintl.jar to lib subpackage to avoid multilib problems
+  (reported by Jim Radford in #595922)
+- disable java for now
+- use chrpath to get us out of rpath hell instead of complicated libtool hacks
+- enable git support
+
 * Fri Apr 23 2010 Jens Petersen <petersen at redhat.com> - 0.17-17
 - create emacs subpackages for po-mode.el (thanks for patch from
   Jonathan Underwood, #579452)


--- 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 ---

