Fix for "make rpm" and "make deb"

diff --git a/.gitignore b/.gitignore
index d89921897ae6b00d4a280883194d448ed042c839..cf890f634b223b69701a4e7bd37abcc1d3e8ac90 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 autom4te.cache
+glog-*.tar.gz
+packages/rpm-unknown
+packages/debian-*

diff --git a/packages/deb.sh b/packages/deb.sh
index e6f4aca9a0c5767e3546f3dd5648dcaf60e19d47..a1cdf321ef58d760437be580839ae4234dc3e8e8 100755 (executable)
--- a/packages/deb.sh
+++ b/packages/deb.sh
@@ -44,16 +44,18 @@ rm -rf tmp
 mkdir -p tmp
 cd tmp
 
+package="google-glog_$VERSION"
+
 # Debian has very specific requirements about the naming of build
 # directories, and tar archives. It also wants to write all generated
 # packages to the parent of the source directory. We accommodate these
 # requirements by building directly from the tar file.
-ln -s "${topdir}/${archive}.tar.gz" "${LIB}${archive}.orig.tar.gz"
-tar zfx "${LIB}${archive}.orig.tar.gz"
-[ -n "${LIB}" ] && mv "${archive}" "${LIB}${archive}"
-cd "${LIB}${archive}"
+ln -s "${topdir}/${archive}.tar.gz" "${LIB}${package}.orig.tar.gz"
+tar zfx "${LIB}${package}.orig.tar.gz"
+mv "${archive}" "${LIB}${package}"
+cd "${LIB}${package}"
 # This is one of those 'specific requirements': where the deb control files live
-ln -s "packages/deb" "debian"
+cp -a "packages/deb" "debian"
 
 # Now, we can call Debian's standard build tool
 debuild -uc -us

diff --git a/packages/deb/changelog b/packages/deb/changelog
index eb36b3ddea2baa0035205f39b83c1a8124ecc4fe..0d730a6a71adf5d2fc09618bc8efd96cd7a8ab88 100644 (file)
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,3 +1,9 @@
+google-glog (0.3.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Google Inc. <opensource@google.com>  Tue, 10 Mar 2015 12:02:20 +0900
+
 google-glog (0.3.3-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/packages/rpm.sh b/packages/rpm.sh
index 5395dc02b82a32b423750f881e969a09962253a8..e5649a22581b948f4a69d293585654bb891af1c2 100755 (executable)
--- a/packages/rpm.sh
+++ b/packages/rpm.sh
@@ -45,7 +45,7 @@ rm -rf "$RPM_SOURCE_DIR" "$RPM_BUILD_DIR"
 mkdir "$RPM_SOURCE_DIR"
 mkdir "$RPM_BUILD_DIR"
 
-cp "$archive" "$RPM_SOURCE_DIR"
+cp "$archive" "$RPM_SOURCE_DIR"/v"$VERSION".tar.gz
 
 rpmbuild -bb rpm/rpm.spec \
   --define "NAME $PACKAGE" \

diff --git a/packages/rpm/rpm.spec b/packages/rpm/rpm.spec
index c2edc83a868e79fc8c817b6d7ff4dc4161bad452..6d58657b853ea955de3e6b5148a2170685f05e3a 100644 (file)
--- a/packages/rpm/rpm.spec
+++ b/packages/rpm/rpm.spec
@@ -7,11 +7,11 @@ Summary: A C++ application logging library
 Version: %VERSION
 Release: %rel
 Group: Development/Libraries
-URL: http://code.google.com/p/google-glog
+URL: http://github.com/google/glog
 License: BSD
 Vendor: Google
 Packager: Google Inc. <opensource@google.com>
-Source: http://%{NAME}.googlecode.com/files/%{NAME}-%{VERSION}.tar.gz
+Source: https://github.com/google/glog/archive/v%{VERSION}.tar.gz
 Distribution: Redhat 7 and above.
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %prefix