[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gmime/EL-5 gmime-2.2.3-libdir.patch, NONE, 1.1 gmime-2.2.3-use-pkg-config.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gmime.spec, 1.3, 1.4 sources, 1.3, 1.4 gmime-2.2.1-use-pkg-config.patch, 1.1, NONE



Author: thl

Update of /cvs/extras/rpms/gmime/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7143

Modified Files:
	.cvsignore gmime.spec sources 
Added Files:
	gmime-2.2.3-libdir.patch gmime-2.2.3-use-pkg-config.patch 
Removed Files:
	gmime-2.2.1-use-pkg-config.patch 
Log Message:
2.2.3-3.1
- use gmime from FC6 for EPEL5
- disabled mono until we have it in EPEL

gmime-2.2.3-libdir.patch:

--- NEW FILE gmime-2.2.3-libdir.patch ---
--- gmime-2.2.3/mono/gmime-sharp.pc.in.libdir	2006-08-18 15:36:13.000000000 +0200
+++ gmime-2.2.3/mono/gmime-sharp.pc.in	2006-08-18 15:36:25.000000000 +0200
@@ -1,5 +1,5 @@
 prefix= prefix@
-libdir=${prefix}/lib
+libdir= libdir@
 
 Name: gmime-sharp 
 Description: .NET binding for GMime
--- gmime-2.2.3/mono/Makefile.am.libdir	2006-08-18 15:09:50.000000000 +0200
+++ gmime-2.2.3/mono/Makefile.am	2006-08-18 15:10:35.000000000 +0200
@@ -62,22 +62,22 @@
 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
 

gmime-2.2.3-use-pkg-config.patch:

--- NEW FILE gmime-2.2.3-use-pkg-config.patch ---
--- gmime-2.2.3/gmime-config.in.use-pkg-config	2005-05-03 19:34:18.000000000 +0200
+++ gmime-2.2.3/gmime-config.in	2006-09-05 16:50:19.000000000 +0200
@@ -3,8 +3,6 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 includedir= includedir@
-glib_cflags="@glib_cflags@"
-glib_libs="@glib_libs@"
 
 usage()
 {
@@ -55,11 +53,11 @@
 	;;
 
     --cflags)
-       	echo @GMIME_INCLUDEDIR@ @GMIME_CFLAGS@ @glib_cflags@
+       	echo `pkg-config --cflags gmime-2.0`
        	;;
 
     --libs)
-       	echo -L libdir@ @GMIME_LIBS@ @LIBS@ @glib_libs@
+       	echo `pkg-config --libs gmime-2.0`
        	;;
 
     *)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gmime/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2006 17:33:33 -0000	1.3
+++ .cvsignore	1 May 2007 11:27:35 -0000	1.4
@@ -1 +1 @@
-gmime-2.2.1.tar.gz
+gmime-2.2.3.tar.gz


Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/EL-5/gmime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmime.spec	4 Dec 2006 17:33:33 -0000	1.3
+++ gmime.spec	1 May 2007 11:27:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gmime
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.2.3
+Release:        3.1%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -11,16 +11,22 @@
 
 BuildRequires:  glib2-devel >= 2.0.0
 BuildRequires:  zlib-devel >= 1.2.1.1
+BuildRequires:  automake, libtool, gettext-devel, gtk-doc
 
-Patch1: gmime-2.2.1-use-pkg-config.patch
+Patch1: gmime-2.2.3-use-pkg-config.patch
+Patch2: gmime-2.2.3-libdir.patch
 
-# Mono disabled for epel
-%define mono_archs none
+# Mono only availible on these:
+#define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc
 # no mono on s390 for now: s390 s390x 
 
+# Mono disabled in EPEL for now
+%define mono_archs foobar
+
+
 %ifarch %mono_archs
 BuildRequires:  mono-devel gtk-sharp2-gapi
-BuildRequires:  gtk-sharp2 >= 2.4.0
+BuildRequires:  gtk-sharp2-devel >= 2.4.0
 %endif
 
 %description
@@ -58,9 +64,11 @@
 %prep
 %setup -q
 %patch1 -p1 -b .use-pkg-config
+%patch2 -p1 -b .libdir
 
 
 %build
+autoreconf --force --install
 %ifarch %mono_archs
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 MONO_ARGS="--enable-mono"
@@ -108,17 +116,31 @@
 %files sharp
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/gmime-sharp.pc
-%{_prefix}/lib/mono/gac/gmime-sharp
-%{_prefix}/lib/mono/gmime-sharp
+%{_libdir}/mono/gac/gmime-sharp
+%{_libdir}/mono/gmime-sharp
 %{_datadir}/gapi-2.0/gmime-api.xml
 %endif
 
 %changelog
-* Mon Dec 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.2.1-2
-- Sync with gmime-2_2_1-1 from core for EPEL (later versions require a newer
-  glib2
-- disable mono for epel
-- use dist
+* Tue Mar 01 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.2.3-3.1
+- use gmime from FC6 for EPEL5
+- disabled mono until we have it in EPEL
+
+* Tue Sep  5 2006 Alexander Larsson <alexl redhat com> - 2.2.3-3
+- fix gmime-config multilib conflict (#205208)
+
+* Sat Aug 19 2006 Matthias Clasen <mclasen redhat com> - 2.2.3-2
+- Rebuild
+
+* Fri Aug 18 2006 Alexander Larsson <alexl redhat com> - 2.2.3-1
+- Upgrade to 2.2.3
+- Use the new mono libdir
+
+* Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - sh: line 0: fg: no job control
+- rebuild
+
+* Fri Jun  9 2006 Alexander Larsson <alexl redhat com> - 2.2.1-2
+- Disable mono parts on s390* as mono doesn't build on s390 atm
 
 * Tue May 23 2006 Alexander Larsson <alexl redhat com> - 2.2.1-1
 - Update to 2.2.1
@@ -167,6 +189,6 @@
 - Fixes to the files section
 - Change ldconfig in post* calls to -p /sbin/ldconfig
 
+
 * Sun Oct 17 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.9-0.fdr.1
 - Initial RPM release.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmime/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2006 17:33:33 -0000	1.3
+++ sources	1 May 2007 11:27:35 -0000	1.4
@@ -1 +1 @@
-b05e4d6344c8465fb74386e5f1fed45c  gmime-2.2.1.tar.gz
+0c48ece8b65955db8e7d89c171de974b  gmime-2.2.3.tar.gz


--- gmime-2.2.1-use-pkg-config.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]