rpms/gnome-build/devel gnome-build-0.2.4-configure.patch, NONE, 1.1 gnome-build-0.2.4-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gnome-build.spec, 1.9, 1.10 sources, 1.4, 1.5 gnome-build-0.2.1-configure.patch, 1.1, NONE gnome-build-0.2.1-pkgconfig.patch, 1.1, NONE

Debarshi Ray (rishi) fedora-extras-commits at redhat.com
Sat Mar 15 15:20:09 UTC 2008


Author: rishi

Update of /cvs/pkgs/rpms/gnome-build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7092

Modified Files:
	.cvsignore gnome-build.spec sources 
Added Files:
	gnome-build-0.2.4-configure.patch 
	gnome-build-0.2.4-pkgconfig.patch 
Removed Files:
	gnome-build-0.2.1-configure.patch 
	gnome-build-0.2.1-pkgconfig.patch 
Log Message:
* Sat Mar 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-1
- Version bump to 0.2.4. Closes Red Hat Bugzilla bug #437557.
- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
- Parallel build problems fixed by upstream.
- Dropped README because it does not have anything useful for the end-user.


gnome-build-0.2.4-configure.patch:

--- NEW FILE gnome-build-0.2.4-configure.patch ---
diff -urNp gnome-build-0.2.4.orig/configure gnome-build-0.2.4/configure
--- gnome-build-0.2.4.orig/configure	2008-03-10 00:35:56.000000000 +0530
+++ gnome-build-0.2.4/configure	2008-03-15 18:36:16.000000000 +0530
@@ -21110,6 +21110,7 @@ if test -n "$PKG_CONFIG"; then
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED
 	libgnome-2.0 >= \$GNOME_REQUIRED
 	libgnomeui-2.0 >= \$GNOME_REQUIRED
+	libglade-2.0 >= \$LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= \$XML_REQUIRED
 	gnome-vfs-2.0 >= \$VFS_REQUIRED
@@ -21119,6 +21120,7 @@ if test -n "$PKG_CONFIG"; then
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21131,6 +21133,7 @@ if test -n "$PKG_CONFIG"; then
   pkg_cv_GBF_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21152,6 +21155,7 @@ if test -n "$PKG_CONFIG"; then
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED
 	libgnome-2.0 >= \$GNOME_REQUIRED
 	libgnomeui-2.0 >= \$GNOME_REQUIRED
+	libglade-2.0 >= \$LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= \$LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= \$XML_REQUIRED
 	gnome-vfs-2.0 >= \$VFS_REQUIRED
@@ -21161,6 +21165,7 @@ if test -n "$PKG_CONFIG"; then
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21173,6 +21178,7 @@ if test -n "$PKG_CONFIG"; then
   pkg_cv_GBF_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21200,6 +21206,7 @@ fi
 	        GBF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21210,6 +21217,7 @@ fi
 	        GBF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21223,6 +21231,7 @@ fi
 	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED
@@ -21242,6 +21251,7 @@ See the pkg-config man page for more det
 echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
 	libgnome-2.0 >= $GNOME_REQUIRED
 	libgnomeui-2.0 >= $GNOME_REQUIRED
+	libglade-2.0 >= $LIBGLADE_REQUIRED
 	libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED
 	libxml-2.0 >= $XML_REQUIRED
 	gnome-vfs-2.0 >= $VFS_REQUIRED

gnome-build-0.2.4-pkgconfig.patch:

--- NEW FILE gnome-build-0.2.4-pkgconfig.patch ---
diff -urNp gnome-build-0.2.4.orig/gnome-build-1.0.pc.in gnome-build-0.2.4/gnome-build-1.0.pc.in
--- gnome-build-0.2.4.orig/gnome-build-1.0.pc.in	2007-01-10 00:54:13.000000000 +0530
+++ gnome-build-0.2.4/gnome-build-1.0.pc.in	2008-03-15 19:14:45.000000000 +0530
@@ -7,6 +7,6 @@ idldir=@datadir@/idl/gnome-build-1.0
 Name: gnome-build
 Description: Gnome Build Framework
 Version: @VERSION@
-Requires:  libgnome-2.0 gtk+-2.0 libxml-2.0 gdl-1.0 gdl-gnome-1.0
+Requires:  gtk+-2.0
 Libs: -L${libdir} -lgbf-1 -lgbf-widgets-1
 Cflags: -I${includedir}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-build/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2008 16:03:00 -0000	1.4
+++ .cvsignore	15 Mar 2008 15:19:34 -0000	1.5
@@ -1 +1 @@
-gnome-build-0.2.1.tar.gz
+gnome-build-0.2.4.tar.gz


Index: gnome-build.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-build/devel/gnome-build.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-build.spec	7 Feb 2008 17:11:22 -0000	1.9
+++ gnome-build.spec	15 Mar 2008 15:19:34 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	GNOME build framework
 Name:		gnome-build
-Version:	0.2.1
-Release:	2%{?dist}
+Version:	0.2.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Libraries
 URL:		http://www.gnome.org/projects/devtools/gnomebuild.shtml
@@ -14,11 +14,11 @@
 
 Provides:	perl(GBF::Make) = %{version}-%{release}
 
-BuildRequires:	chrpath
 BuildRequires:	gettext
 BuildRequires:	intltool
 BuildRequires:	libgdl-devel
 BuildRequires:	libgnomeui-devel
+BuildRequires:	perl(Locale::gettext)
 
 %description
 GNOME build framework provides the project management components of the
@@ -72,17 +72,21 @@
 chmod 644 `find . -name "*.h" -perm /111 -print`
 
 %build
-%if 0%{?fc9}
+%if 0%{?fc7}%{?fc8}
+%else
   export CPPFLAGS="-D_GNU_SOURCE"
 %endif
 
 %configure --disable-static
 
+# Remove rpaths.
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-# Parallel make does not work.
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,11 +96,6 @@
 
 %find_lang gbf-1
 
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgbf-widgets-1.so.1.0.0
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-1.0/backends/libgbf-am.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-1.0/backends/libgbf-mkfile.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -111,7 +110,6 @@
 %doc COPYING
 %doc MAINTAINERS
 %doc NEWS
-%doc README
 %{_bindir}/gbf-am-parse
 %{_bindir}/gbf-mkfile-parse
 %{_datadir}/pixmaps/gbf-build.png
@@ -137,6 +135,12 @@
 %{_includedir}/%{name}-1.0/gbf
 
 %changelog
+* Sat Mar 15 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-1
+- Version bump to 0.2.4. Closes Red Hat Bugzilla bug #437557.
+- Removed 'BuildRequires: chrpath' and use better ways of removing rpaths.
+- Parallel build problems fixed by upstream.
+- Dropped README because it does not have anything useful for the end-user.
+
 * Sun Feb 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.1-2
 - Fixed build failure in Rawhide by defining _GNU_SOURCE.
 - Omitted unused direct shared library dependencies.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-build/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2008 16:03:00 -0000	1.4
+++ sources	15 Mar 2008 15:19:34 -0000	1.5
@@ -1 +1 @@
-d74eb1851538e4c8f46e75ae5a2ed307  gnome-build-0.2.1.tar.gz
+1484752617b80623c45bc401147e2750  gnome-build-0.2.4.tar.gz


--- gnome-build-0.2.1-configure.patch DELETED ---


--- gnome-build-0.2.1-pkgconfig.patch DELETED ---




More information about the fedora-extras-commits mailing list