luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for "make rpm" and "make deb"

Browse Source
This commit is contained in:
Fumitoshi Ukai 2015-03-10 12:44:30 +09:00
parent 3b0372bd70
commit 5ab077bb8d
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1 +1,4 @@
autom4te.cache autom4te.cache
glog-*.tar.gz
packages/rpm-unknown
packages/debian-*

12
packages/deb.sh
View File

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

6
packages/deb/changelog
View File

@ -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 google-glog (0.3.3-1) unstable; urgency=low
* New upstream release. * New upstream release.

2
packages/rpm.sh
View File

@ -45,7 +45,7 @@ rm -rf "$RPM_SOURCE_DIR" "$RPM_BUILD_DIR"
mkdir "$RPM_SOURCE_DIR" mkdir "$RPM_SOURCE_DIR"
mkdir "$RPM_BUILD_DIR" mkdir "$RPM_BUILD_DIR"
cp "$archive" "$RPM_SOURCE_DIR" cp "$archive" "$RPM_SOURCE_DIR"/v"$VERSION".tar.gz
rpmbuild -bb rpm/rpm.spec \ rpmbuild -bb rpm/rpm.spec \
--define "NAME $PACKAGE" \ --define "NAME $PACKAGE" \

4
packages/rpm/rpm.spec
View File

@ -7,11 +7,11 @@ Summary: A C++ application logging library
Version: %VERSION Version: %VERSION
Release: %rel Release: %rel
Group: Development/Libraries Group: Development/Libraries
URL: http://code.google.com/p/google-glog URL: http://github.com/google/glog
License: BSD License: BSD
Vendor: Google Vendor: Google
Packager: Google Inc. <opensource@google.com> 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. Distribution: Redhat 7 and above.
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
Prefix: %prefix Prefix: %prefix