rpms/gmime/devel gmime-2.4.3-libdir.patch, NONE, 1.1 gmime.spec, 1.43, 1.44 gmime-2.2.3-libdir.patch, 1.2, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gmime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9613

Modified Files:
	gmime.spec 
Added Files:
	gmime-2.4.3-libdir.patch 
Removed Files:
	gmime-2.2.3-libdir.patch 
Log Message:
merge review fixes


gmime-2.4.3-libdir.patch:

--- NEW FILE gmime-2.4.3-libdir.patch ---
diff -urNp gmime-2.4.3.orig/mono/gmime-sharp-2.4.pc.in gmime-2.4.3/mono/gmime-sharp-2.4.pc.in
--- gmime-2.4.3.orig/mono/gmime-sharp-2.4.pc.in	2008-12-31 11:54:12.563970072 +0530
+++ gmime-2.4.3/mono/gmime-sharp-2.4.pc.in	2008-12-31 12:07:48.780969928 +0530
@@ -1,5 +1,5 @@
 prefix=@prefix@
-libdir=${prefix}/lib
+libdir=@libdir@
 
 Name: gmime-sharp 
 Version: @VERSION@
diff -urNp gmime-2.4.3.orig/mono/Makefile.in gmime-2.4.3/mono/Makefile.in
--- gmime-2.4.3.orig/mono/Makefile.in	2008-12-31 11:54:12.533969961 +0530
+++ gmime-2.4.3/mono/Makefile.in	2008-12-31 11:55:40.075720099 +0530
@@ -472,22 +472,22 @@ $(ASSEMBLY): $(build_sources) generated-
 install-data-local:
 	@if test -n '$(TARGET)'; then									\
 	  if test -n '$(DESTDIR)'; then								\
-	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";		\
-	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";		\
+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;	\
 	  else												\
-	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib";			\
-	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1;		\
+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir)";			\
+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;		\
 	  fi;												\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then									\
 	  if test -n '$(DESTDIR)'; then								\
-	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";	\
-	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1;  \
+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";	\
+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;  \
 	  else												\
-	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib";	\
-	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1;	\
+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir)";	\
+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;	\
 	  fi;												\
 	fi
 


Index: gmime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gmime.spec	24 Feb 2009 22:23:30 -0000	1.43
+++ gmime.spec	31 Mar 2009 16:33:36 -0000	1.44
@@ -9,11 +9,12 @@
 Source0:        http://download.gnome.org/sources/gmime/2.4/gmime-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  chrpath
 BuildRequires:  glib2-devel >= 2.6.0
 BuildRequires:  zlib-devel >= 1.2.1.1
-BuildRequires:  automake, libtool, gettext-devel, gtk-doc
+BuildRequires:  gettext-devel, gtk-doc
 
-Patch2: gmime-2.2.3-libdir.patch
+Patch2: gmime-2.4.3-libdir.patch
 
 # no mono on s390 for now, thus exclude s390 s390x
 %ifarch s390 s390x ppc64
@@ -47,7 +48,7 @@
 
 %if 0%buildmono
 %package        sharp
-Summary:        mono bindings for gmime
+Summary:        Mono bindings for gmime
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtk-sharp2
@@ -64,25 +65,26 @@
 %patch2 -p1 -b .libdir
 
 %build
-cp %{_datadir}/gettext/config.rpath .
-autoreconf --force --install
 %if 0%buildmono
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 MONO_ARGS="--enable-mono"
 %endif
-%configure $MONO_ARGS --disable-static
-make %{?_smp_mflags}
+# Don't conflict with sharutils.
+%configure $MONO_ARGS --program-prefix=%{name} --disable-static
+
+# Omit unused direct shared library dependencies.
+sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=$RPM_BUILD_ROOT transform='s,x,x'
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-# Don't conflict with sharutils:
-mv $RPM_BUILD_ROOT%{_bindir}/uuencode $RPM_BUILD_ROOT%{_bindir}/gmime-uuencode
-mv $RPM_BUILD_ROOT%{_bindir}/uudecode $RPM_BUILD_ROOT%{_bindir}/gmime-uudecode
 
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gmime-uuencode
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gmime-uudecode
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,6 +119,9 @@
 %endif
 
 %changelog
+* Tue Mar 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.4.3-4
+- Merge review feedback (#225808)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- gmime-2.2.3-libdir.patch DELETED ---