From 5ab077bb8dd09a061497cfd20518b2900376e699 Mon Sep 17 00:00:00 2001
From: Fumitoshi Ukai <fumitoshi.ukai@gmail.com>
Date: Tue, 10 Mar 2015 12:44:30 +0900
Subject: [PATCH] Fix for "make rpm" and "make deb"

---
 .gitignore             |  3 +++
 packages/deb.sh        | 12 +++++++-----
 packages/deb/changelog |  6 ++++++
 packages/rpm.sh        |  2 +-
 packages/rpm/rpm.spec  |  4 ++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index d899218..cf890f6 100644
--- 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 e6f4aca..a1cdf32 100755
--- 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 eb36b3d..0d730a6 100644
--- 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 5395dc0..e5649a2 100755
--- 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 c2edc83..6d58657 100644
--- 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
-- 
2.34.1