Permalink
Browse files

Prepare the 0.5.1 release.

  • Loading branch information...
dagwieers committed Jul 30, 2006
1 parent 86cf6b2 commit 722bb86ba159bca7756287d4cf45e87691c54e56
Showing with 34 additions and 5 deletions.
  1. +4 −1 ChangeLog
  2. +12 −0 Makefile
  3. +9 −0 config/dconf-redhat.conf
  4. +5 −3 dconf
  5. +4 −1 dconf.spec
View
@@ -1,5 +1,8 @@
-* 0.5.1 - ... - release 02/10/2005
+* 0.5.1 - Munchkin - release 30/07/2006
- Fixed -q option to not require argument (Stelios Bounanos)
+- Syslog now has proper tag and pid associated
+- Moved proprietary sections together
+- Added netiq and iproute2 section
* 0.5.0 - Return To Hasselt - released 09/09/2005
- Disable digests in rpmdb too. (Bert de Bruijn)
View
@@ -1,3 +1,6 @@
+name = dconf
+version = $(shell awk '/^Version: / {print $$2}' $(name).spec)
+
prefix = /usr
sysconfdir = /etc
bindir = $(prefix)/bin
@@ -43,3 +46,12 @@ clean:
%.xml: %.txt
asciidoc -b docbook -d manpage $<
+
+dist: clean
+ find . ! -wholename '*/.svn*' | pax -d -w -x ustar -s ,^,$(name)-$(version)/, | bzip2 >../$(name)-$(version).tar.bz2
+
+rpm: dist
+ rpmbuild -tb --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_rpmdir ../" ../$(name)-$(version).tar.bz2
+
+srpm: dist
+ rpmbuild -ts --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_srcrpmdir../" ../$(name)-$(version).tar.bz2
View
@@ -79,6 +79,15 @@ files =
/etc/dbus-1/system.d/hal.conf
/etc/hal/hald.conf
+[iproute2]
+files =
+ /etc/iproute2/ematch_map
+ /etc/iproute2/rt_dsfield
+ /etc/iproute2/rt_protos
+ /etc/iproute2/rt_realms
+ /etc/iproute2/rt_scopes
+ /etc/iproute2/rt_tables
+
[ipsec]
files =
/etc/ipsec.conf
View
8 dconf
@@ -4,7 +4,7 @@ import os, sys, glob, re, shutil, getopt, popen2, time, fnmatch
import ConfigParser, urlparse, pwd, grp, stat, syslog
import difflib, smtplib, gzip, md5, sha
-VERSION = '0.5.0'
+VERSION = '0.5.1'
enable = ('yes', 'on', 'true', '1')
disable = ('no', 'off', 'false', '0')
@@ -323,7 +323,8 @@ def main():
# os.setenv('LC_ALL', 'C')
os.environ['LC_ALL'] = 'C'
- syslog.syslog('Dconf started.')
+ syslog.openlog('dconf[%d]' % os.getpid())
+ syslog.syslog('Dconf %s started.' % VERSION)
### Add to cron
if cf.cron and not op.output:
@@ -434,7 +435,8 @@ def main():
log.write(o.read() + '\n')
log.close()
- syslog.syslog('Dconf ended succesfully.')
+ syslog.syslog('Dconf %s ended succesfully.' % VERSION)
+ syslog.closelog()
if op.output:
return
View
@@ -4,7 +4,7 @@
Summary: Create a system's hardware and software configuration snapshot
Name: dconf
-Version: 0.5.0
+Version: 0.5.1
Release: 1
License: GPL
Group: System Environment/Base
@@ -58,6 +58,9 @@ fi
%{_localstatedir}/log/dconf/
%changelog
+* Sun Jul 30 2006 Dag Wieers <dag@wieers.com> - 0.5.1-1
+- Updated to release 0.5.1.
+
* Fri Sep 09 2005 Dag Wieers <dag@wieers.com> - 0.5.0-1
- Updated to release 0.5.0.

0 comments on commit 722bb86

Please sign in to comment.