rpms/gnome-common/FC-2 gnome-common.spec,1.2,1.3 sources,1.2,1.3

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/gnome-common/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv21347

Modified Files:
	gnome-common.spec sources 
Log Message:
Sync with fedora.us update bug 2066


Index: gnome-common.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-common/FC-2/gnome-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-common.spec	8 Nov 2004 04:28:07 -0000	1.2
+++ gnome-common.spec	27 Nov 2004 15:55:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-common
-Version:        2.4.0
-Release:        0.fdr.3.2
+Version:        2.8.0
+Release:        0.fdr.1.2
 Epoch:          0
 Summary:        Useful things common to building gnome packages from scratch.
 
@@ -8,15 +8,21 @@
 BuildArch:      noarch
 License:        GPL
 URL:            http://developer.gnome.org
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pkgconfig automake autoconf
-Requires: automake
-Requires: autoconf
-Requires: libtool
+# Hmmm.... gnome-common needs all of these.  But it doesn't necessarily need
+# a particular version.  We could install automake14 and not automake, for
+# instance, and things would still work....  Is it better to drop requirements
+# altogether?  (gnome-common programs will run but give an error without
+# doing anything useful.)
+#Requires: automake
+#Requires: autoconf
+# gnome-common can be used in a way that doesn't require either of these.
+# Unrequiring them for the moment.
+#Requires: libtool
+#Requires: gettext
 Requires: pkgconfig
-Requires: gettext
 
 %description
 This package contains sample files that should be used to develop pretty much
@@ -32,9 +38,9 @@
 %configure
 make %{?_smp_mflags}
 cp doc-build/README doc-README
-cp macros/ChangeLog ChangeLog.macros
 cp macros2/ChangeLog ChangeLog.macros2
-cp bin/ChangeLog ChangeLog.bin
+# No sense making a doc subdir in the rpm pkg for one file.
+cp doc/usage.txt usage.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,21 +51,30 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc-README README COPYING
-%doc ChangeLog ChangeLog.macros ChangeLog.macros2 ChangeLog.bin
+%doc doc-README README COPYING usage.txt
+%doc ChangeLog ChangeLog.macros2
 %{_bindir}/*
 %{_datadir}/aclocal/*
 %{_datadir}/%{name}
 
 %changelog
-* Mon Mar 22 2004 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:2.4.0-0.fdr.3
+* Tue Sep 14 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.8.0-0.fdr.1
+- Update to 2.8.0
+  + This release supports automake thru version 1.9 and has had a lot of
+    deprecated stuff cleaned out.
+- Removed BuildRequires.  A base mach build environment will build it now.
+- Removed Requires.  Although gnome-common still requires autoconf and
+  friends, it doesn't require a specific version of them.  There's no virtual
+  provides in the automake14,15,16,17 automake packages that could help here.
+  
+* Mon Mar 22 2004 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.4.0-0.fdr.3
 - Add COPYING file to the docs
 - Add bin/Changelog to the docs as ChangeLog.bin
 
-* Sun Dec 28 2003 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:2.4.0-0.fdr.2
+* Sun Dec 28 2003 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.4.0-0.fdr.2
 - Update the Requires line (rpm doesn't automatically detect most of the
   dependencies.)
 - Remove the AUTHORS file as it's currently empty
 
-* Fri Dec 19 2003 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:2.4.0-0.fdr.1
+* Fri Dec 19 2003 Toshio Kuratomi <toshio-tiki-lounge.com> - 0:2.4.0-0.fdr.1
 - Initial RPM release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-common/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:28:01 -0000	1.2
+++ sources	27 Nov 2004 15:55:40 -0000	1.3
@@ -1 +1 @@
-9f5163e616b2a02af633de9c82557fa0  gnome-common-2.4.0.tar.bz2
+4630d4cf2b83499c89211b3ae76b662f  gnome-common-2.8.0.tar.bz2