1
0
Fork 0

- Added a distarchive target for the Makefile for proper tagging in git

- Added a explanation how to create the tarball via git in the specfile
- Fixed the defattr() lines in the specfile to conform FRG
This commit is contained in:
Philip Knirsch 2009-02-25 18:23:15 +01:00
parent fd0d01812c
commit 2f9173b101
2 changed files with 12 additions and 7 deletions

View file

@ -5,7 +5,7 @@ VERSIONED_NAME = $(NAME)-$(VERSION)
DESTDIR = /
MANDIR = /usr/share/man/
GITTAG = r$(subst .,-,$(VERSION))
GITTAG = v$(VERSION)
DIRS = doc contrib tuningplugins monitorplugins
FILES = tuned tuned.spec Makefile tuned.py tuned.initscript tuned.conf
@ -15,6 +15,8 @@ FILES_tuningplugins = tuningplugins/disk.py tuningplugins/net.py tuningplugins/_
FILES_monitorplugins = monitorplugins/disk.py monitorplugins/net.py monitorplugins/__init__.py
DOCS = AUTHORS ChangeLog COPYING INSTALL NEWS README
distarchive: tag archive
archive:
rm -rf $(VERSIONED_NAME)
mkdir -p $(VERSIONED_NAME)
@ -32,7 +34,8 @@ archive:
ln -fs $(VERSIONED_NAME).tar.bz2 latest-archive
tag:
git tag $(GITTAG)
git tag -f $(GITTAG)
git push --tags
srpm: archive
rm -rf rpm-build-dir

View file

@ -4,9 +4,11 @@ Version: 0.1.0
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Daemons
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# git clone http://fedorapeople.org/~pknirsch/git/tuned.git/
# The source for this package was pulled from upstream git. Use the
# following commands to get the corresponding tarball:
# git clone git://fedorapeople.org/~pknirsch/tuned.git/
# cd tuned
# git checkout v%{version}
# make archive
Source: tuned-%{version}.tar.bz2
URL: http://fedorapeople.org/~pknirsch/git/tuned.git/
@ -56,7 +58,7 @@ if [ "$1" -ge "1" ] ; then
fi
%files
%defattr(-,root,root)
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/README.txt doc/TIPS.txt
%{_initddir}/tuned
%config(noreplace) %{_sysconfdir}/tuned.conf
@ -65,7 +67,7 @@ fi
%{_mandir}/man8/*
%files utils
%defattr(-,root,root)
%defattr(-,root,root,-)
%{_sbindir}/netdevstat
%{_sbindir}/diskdevstat