rpms/gnome-build/F-7 gnome-build-0.2.1-configure.patch, NONE, 1.1 gnome-build-0.2.1-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnome-build.spec, 1.6, 1.7 sources, 1.3, 1.4

Sat Feb 2 15:39:13 UTC 2008

Author: rishi

Update of /cvs/pkgs/rpms/gnome-build/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9766/F-7

Modified Files:
	.cvsignore gnome-build.spec sources 
Added Files:
	gnome-build-0.2.1-configure.patch 
	gnome-build-0.2.1-pkgconfig.patch 
Log Message:
Initial import into F-7.
 
 Modified Files:
 	F-7/.cvsignore F-7/gnome-build.spec F-7/sources 
 Added Files:
 	F-7/gnome-build-0.2.1-configure.patch 
 	F-7/gnome-build-0.2.1-pkgconfig.patch 


gnome-build-0.2.1-configure.patch:

--- NEW FILE gnome-build-0.2.1-configure.patch ---
--- gnome-build-0.2.1.orig/configure	2008-01-29 01:58:28.000000000 +0530
+++ gnome-build-0.2.1/configure	2008-02-02 00:51:05.000000000 +0530
@@ -21100,6 +21100,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
@@ -21109,6 +21110,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
@@ -21121,6 +21123,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
@@ -21142,6 +21145,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
@@ -21151,6 +21155,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
@@ -21163,6 +21168,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
@@ -21190,6 +21196,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
@@ -21200,6 +21207,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
@@ -21213,6 +21221,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
@@ -21232,6 +21241,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.1-pkgconfig.patch:

--- NEW FILE gnome-build-0.2.1-pkgconfig.patch ---
diff -urNp gnome-build-0.2.1.orig/gnome-build-1.0.pc.in gnome-build-0.2.1/gnome-build-1.0.pc.in
--- gnome-build-0.2.1.orig/gnome-build-1.0.pc.in	2007-01-10 00:54:13.000000000 +0530
+++ gnome-build-0.2.1/gnome-build-1.0.pc.in	2008-02-02 01:18:27.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/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2007 23:34:11 -0000	1.3
+++ .cvsignore	2 Feb 2008 15:38:36 -0000	1.4
@@ -1 +1 @@
-gnome-build-0.1.4.tar.bz2
+gnome-build-0.2.1.tar.gz


Index: gnome-build.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-build/F-7/gnome-build.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-build.spec	19 Jan 2007 18:22:10 -0000	1.6
+++ gnome-build.spec	2 Feb 2008 15:38:36 -0000	1.7
@@ -1,131 +1,148 @@
-Name: gnome-build
-Summary: GNOME Build Framework
-Version: 0.1.4
-Release: 2%{?dist}
-License: GPL
-Group: Development/Libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-build/0.1/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-URL: http://www.gnome.org/projects/devtools/gnomebuild.shtml
-BuildRequires: anjuta-gdl-devel, libgnomeui-devel, intltool, libtool, gettext
-Provides: perl(GBF::Make)
+Summary:	GNOME build framework
+Name:		gnome-build
+Version:	0.2.1
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Development/Libraries
+URL:		http://www.gnome.org/projects/devtools/gnomebuild.shtml
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-build/0.2/%{name}-%{version}.tar.gz
+
+Patch0:		%{name}-%{version}-configure.patch
+Patch1:		%{name}-%{version}-pkgconfig.patch
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Provides:	perl(GBF::Make) = %{version}-%{release}
+
+BuildRequires:	chrpath
+BuildRequires:	gettext
+BuildRequires:	intltool
+BuildRequires:	libgdl-devel
+BuildRequires:	libgnomeui-devel
 
 %description
-This is the GNOME Build Framework (GBF).
+GNOME build framework provides the project management components of the
+development environment. This includes management of source-code resources,
+generation of makefiles, and build management.
 
 %package devel
-Summary: Libraries and include files for Gnome Build Framework
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release} pkgconfig
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+
+Requires:	gtk2-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
 %description devel 
-Libraries and header files if you want to make use of the GNOME debug framework
-in your own programs.
+This package contains development files for %{name}.
 
 %prep
 %setup -q
-find . -name '*.[ch]' | xargs chmod 644
+%patch0 -p1
+%patch1 -p1
+
+# Filter unwanted Provides:
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
   sed -e '/perl(Make)/d' \
-      -e '/perl(Make::Target)/d' \
-      -e '/perl(Make::Rule::Vars)/d' \
-      -e '/perl(Make::Rule)/d'
+  -e '/perl(Make::Target)/d' \
+  -e '/perl(Make::Rule::Vars)/d' \
+  -e '/perl(Make::Rule)/d'
 EOF
 
 %define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
+# Filter unwanted Requires:
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
   sed -e '/perl(Make)/d' \
-      -e '/perl(Make::Target)/d' \
-      -e '/perl(Make::Rule::Vars)/d' \
-      -e '/perl(Make::Rule)/d'
+  -e '/perl(Make::Target)/d' \
+  -e '/perl(Make::Rule::Vars)/d' \
+  -e '/perl(Make::Rule)/d'
 EOF
 
 %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
+# Suppress rpmlint error.
+chmod 644 `find . -name "*.c" -perm /111 -print`
+chmod 644 `find . -name "*.h" -perm /111 -print`
+
 %build
 %configure --disable-static
-make LIBTOOL=%{_prefix}/bin/libtool 
-# smp_mflags omitted as it breaks the build (race condition)
+
+# Parallel make does not work.
+make
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
+rm -rf $RPM_BUILD_ROOT
+
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+
 %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 %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f gbf-1.lang
-%doc AUTHORS COPYING NEWS README
-%defattr (-, root, root)
-%{_bindir}/gbf*
+%defattr (-,root,root,-)
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc MAINTAINERS
+%doc NEWS
+%doc README
+%{_bindir}/gbf-am-parse
+%{_bindir}/gbf-mkfile-parse
+%{_datadir}/pixmaps/gbf-build.png
+%{_datadir}/pixmaps/gbf-install.png
 %{_libdir}/libgbf-1.so.*
 %{_libdir}/libgbf-widgets-1.so.*
-%{_libdir}/%{name}-1.0/
-%{_datadir}/%{name}/
-%{_datadir}/pixmaps/gbf*png
+
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/GBF
+%{_datadir}/%{name}/glade
+
+%dir %{_libdir}/%{name}-1.0
+# Contains *.so files that are not symlinked to *.so.* files.
+%{_libdir}/%{name}-1.0/backends
 
 %files devel
-%defattr (-, root, root)
-%{_includedir}/gnome-build-1.0/
-%{_libdir}/pkgconfig/gnome-build-1.0.pc
+%defattr (-,root,root,-)
 %{_libdir}/libgbf-1.so
 %{_libdir}/libgbf-widgets-1.so
+%{_libdir}/pkgconfig/%{name}-1.0.pc
 
-%changelog
-* Fri Jan 19 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.4-2
-- include Provides perl gbf make
-
-* Tue Jan 16 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.4-1
-- bump
+%dir %{_includedir}/%{name}-1.0
+%{_includedir}/%{name}-1.0/gbf
 
-* Mon Aug 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-8
-- Changed URL
-- Added pkgconfig to the R on devel
-- removed cp from install
-- added comment for missing smp_mflags
-
-* Tue Aug 01 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-7
-- Fixed source0
-
-* Sat Jul 29 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-6
-- spec file cleans
-- possible 64 bit -fPIC solution
-
-* Mon Jul 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-5
-- Various spec file fixes (thanks to Paul Howard)
-- removal of perl material
-
-* Sat Jul 08 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-3
-- Various rpmlint fixes
-
-* Mon Jul 05 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-2
-- Added BR perl(XML::Parser)
-- Fixed illegal directory ownerships
-- Multiple spec file fixes
-
-* Tue May 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.3-1
-- bump to 0.1.3
-- added --disable-static to configure
-
-* Mon Apr 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.2-2
-- Added smp_mflags to make
-
-* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1.2-1
-- Initial import to FC structure
-
-* Wed Aug 8 2001 Jens Finke <jens at gnome.org> 
-- created spec file
+%changelog
+* Sat Feb 02 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.1-1
+- Version bump to 0.2.1.
+- Fixed build failure caused by missing PKG_CHECK_MODULES entry in configure
+  script.
+- Parallel build problems fixed by upstream.
+
+* Thu Jan 24 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.0-3
+- Fixed gnome-build-1.0.pc.in by trimming 'Requires' list.
+- Preserved timestamps using 'install -p'.
+
+* Mon Jan 21 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.0-2
+- Addressed warnings generated by rpmlint.
+
+* Sun Jan 13 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.0-1
+- Initial build. Imported SPEC from Rawhide.
+- Disabled parallel make to prevent failure.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-build/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2007 23:34:12 -0000	1.3
+++ sources	2 Feb 2008 15:38:36 -0000	1.4
@@ -1 +1 @@
-a453f4ce27c3d7890d7156c1191bbbba  gnome-build-0.1.4.tar.bz2
+d74eb1851538e4c8f46e75ae5a2ed307  gnome-build-0.2.1.tar.gz


