Thu Sep 10 12:53:04 2009 Google Inc. <opensource@google.com>

	* google-gflags: version 1.2
	* PORTABILITY: can now build and run tests under mingw (csilvers)
	* Using a string arg for a bool flag is a compile-time error (rbayardo)
	* Add --helpxml to gflags.py (salcianu)
	* Protect against a hypothetical global d'tor mutex problem (csilvers)
	* BUGFIX: can now define a flag after 'using namespace google' (hamaji)


git-svn-id: https://gflags.googlecode.com/svn/trunk@32 6586e3c6-dcc4-952a-343f-ff74eb82781d

3 files changed, 43 insertions, 22 deletions

diff --git a/packages/deb/changelog b/packages/deb/changelog
index 70c3526..07395ca 100644
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,3 +1,9 @@
+gflags (1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Google Inc. <opensource@google.com>  Thu, 10 Sep 2009 12:53:04 -0700
+
 gflags (1.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/packages/rpm.sh b/packages/rpm.sh
index 5395dc0..381bd88 100755
--- a/packages/rpm.sh
+++ b/packages/rpm.sh
@@ -47,7 +47,18 @@ mkdir "$RPM_BUILD_DIR"
 
 cp "$archive" "$RPM_SOURCE_DIR"
 
-rpmbuild -bb rpm/rpm.spec \
+# rpmbuild -- as far as I can tell -- asks the OS what CPU it has.
+# This may differ from what kind of binaries gcc produces.  dpkg
+# does a better job of this, so if we can run 'dpkg --print-architecture'
+# to get the build CPU, we use that in preference of the rpmbuild
+# default.
+target=`dpkg --print-architecture 2>/dev/null`   # "" if dpkg isn't found
+if [ -n "$target" ]
+then
+   target=" --target $target"
+fi
+
+rpmbuild -bb rpm/rpm.spec $target \
   --define "NAME $PACKAGE" \
   --define "VERSION $VERSION" \
   --define "_sourcedir $RPM_SOURCE_DIR" \
diff --git a/packages/rpm/rpm.spec b/packages/rpm/rpm.spec
index ba3b509..2a5d39e 100644
--- a/packages/rpm/rpm.spec
+++ b/packages/rpm/rpm.spec
@@ -32,6 +32,15 @@ The %name-devel package contains static and debug libraries and header
 files for developing applications that use the %name package.
 
 %changelog
+	* Thu Sep 10 2009 <opensource@google.com>
+        - Change from '%configure' to something like it, but without -m32
+
+	* Mon Apr 20 2009 <opensource@google.com>
+	- Change build rule to use '%configure' rather than './configure'
+	- Change install to use DESTDIR instead of prefix for make install.
+	- Use wildcards for doc/ and lib/ directories
+        - Use {_libdir}/{_includedir}/etc instead of {prefix}/lib, etc
+
 	* Tue Dec 13 2006 <opensource@google.com>
 	- First draft
 
@@ -39,12 +48,15 @@ files for developing applications that use the %name package.
 %setup
 
 %build
-./configure
-make prefix=%prefix
+# I can't use '% configure', because it defines -m32 which breaks the
+# build somehow on my system.  But I do take as much from % configure
+# (in /usr/lib/rpm/macros) as I can.
+./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,28 +64,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 
-## Mark all installed files within /usr/share/doc/{package name} as
-## documentation.  This depends on the following two lines appearing in
-## Makefile.am:
-##     docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-##     dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
 %docdir %{prefix}/share/doc/%{NAME}-%{VERSION}
 %{prefix}/share/doc/%{NAME}-%{VERSION}/*
 
-%{prefix}/lib/libgflags.so.0
-%{prefix}/lib/libgflags.so.0.0.0
-%{prefix}/lib/libgflags_nothreads.so.0
-%{prefix}/lib/libgflags_nothreads.so.0.0.0
-%{prefix}/bin/gflags_completions.sh
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc doc/*
+
+%{_libdir}/*.so.*
+%{_bindir}/gflags_completions.sh
 
 %files devel
 %defattr(-,root,root)
 
-%{prefix}/include/google
-%{prefix}/include/gflags
-%{prefix}/lib/libgflags.a
-%{prefix}/lib/libgflags.la
-%{prefix}/lib/libgflags.so
-%{prefix}/lib/libgflags_nothreads.a
-%{prefix}/lib/libgflags_nothreads.la
-%{prefix}/lib/libgflags_nothreads.so
+%{_includedir}/gflags
+%{_includedir}/google
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so