cleanup makefile

2 files changed, 77 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index ea98f22..5f09c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,26 @@
+2006-09-05 14:49  nanardon
+
+	* soft/rpm/rpm-helper/trunk/Makefile: - cleanup
+
+2006-09-05 14:49  nanardon
+
+	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by svn2cl
+
+2006-09-05 14:47  nanardon
+
+	* soft/rpm/rpm-helper/trunk/Makefile,
+	  soft/rpm/rpm-helper/trunk/rpm-helper.spec: - no spec file in
+	  source
+
 2006-09-05 08:43  guillomovitch
 
 	* soft/rpm/rpm-helper/trunk/del-webapp: oops, fixed previous commit
 
 2006-08-31 11:38  guillomovitch
 
-	* soft/rpm/rpm-helper/trunk/del-webapp: test httpd service
-	  presence before using it, in case of simultaneous removal
-	  scenario (see bug #24188)
+	* soft/rpm/rpm-helper/trunk/del-webapp: test httpd service presence
+	  before using it, in case of simultaneous removal scenario (see
+	  bug #24188)
 
 2006-06-23 12:41  nanardon
 
@@ -25,8 +39,8 @@
 
 2006-06-22 21:26  nanardon
 
-	* soft/rpm/rpm-helper/trunk/rpm-helper.macros.in: - fix arg pass
-	  to the web app helper
+	* soft/rpm/rpm-helper/trunk/rpm-helper.macros.in: - fix arg pass to
+	  the web app helper
 
 2006-06-17 20:11  nanardon
 
@@ -64,6 +78,9 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  20_Sep
+
+2005-09-20 07:05  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.14-1mdk
 
 2005-09-20 07:04  flepied
@@ -75,6 +92,9 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  10_Sep
+
+2005-09-10 05:50  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.13-1mdk
 
 2005-09-10 05:29  flepied
@@ -114,8 +134,8 @@
 2005-08-19 19:06  herton
 
 	* soft/rpm/rpm-helper/trunk/add-syslog,
-	  soft/rpm/rpm-helper/trunk/del-syslog: - Fix bug when handling
-	  log entries comprised of all levels at syslog-ng
+	  soft/rpm/rpm-helper/trunk/del-syslog: - Fix bug when handling log
+	  entries comprised of all levels at syslog-ng
 	  configuration file.
 	  - Correctly handle '*' character inside names of configuration
 	  tokes,
@@ -123,15 +143,15 @@
 	  expression.
 	  - Fix bug when get source name inside add-syslog, in the case
 	  there
-	  isn't a different source, instead the default source /dev/log
-	  is used
+	  isn't a different source, instead the default source /dev/log is
+	  used
 	  (the case where $source variable is empty).
 
 2005-08-04 18:26  herton
 
 	* soft/rpm/rpm-helper/trunk/add-syslog,
-	  soft/rpm/rpm-helper/trunk/del-syslog: - Fix usage bug:
-	  add-syslog and del-syslog can also accept only one
+	  soft/rpm/rpm-helper/trunk/del-syslog: - Fix usage bug: add-syslog
+	  and del-syslog can also accept only one
 	  parameter, the unix stream log source.
 	  - Shell script must exit with 'exit' command, not 'return'.
 	  - Before using service command we must check if the initscript
@@ -142,8 +162,7 @@
 	  - Removed duplicated comment.
 	  - We must check level if empty in del-syslog, in the case we're
 	  using
-	  only source argument, otherwise we get various grep usage
-	  erros.
+	  only source argument, otherwise we get various grep usage erros.
 
 2005-08-03 12:33  herton
 
@@ -163,8 +182,8 @@
 	  soft/rpm/rpm-helper/trunk/README,
 	  soft/rpm/rpm-helper/trunk/README.CVS,
 	  soft/rpm/rpm-helper/trunk/rpm-helper.macros.in,
-	  soft/rpm/rpm-helper/trunk/rpm-helper.spec: - Added syslog
-	  helpers (currently they support syslog-ng and sysklogd).
+	  soft/rpm/rpm-helper/trunk/rpm-helper.spec: - Added syslog helpers
+	  (currently they support syslog-ng and sysklogd).
 	  - s/mandrake/mandriva on misc files.
 
 2005-06-30 08:40  othauvin
@@ -175,6 +194,9 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  30_jun
+
+2005-06-30 08:33  othauvin
+
 	* soft/rpm/rpm-helper/trunk/ChangeLog,
 	  soft/rpm/rpm-helper/trunk/Makefile,
 	  soft/rpm/rpm-helper/trunk/rpm-helper.macros.in,
@@ -190,6 +212,9 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  23_Sep
+
+2004-09-23 01:03  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.10-1mdk
 
 2004-09-23 01:02  flepied
@@ -199,8 +224,8 @@
 
 2003-11-01 07:43  flepied
 
-	* soft/rpm/rpm-helper/trunk/build-config-file: first version.
-	  Needs testing.
+	* soft/rpm/rpm-helper/trunk/build-config-file: first version. Needs
+	  testing.
 
 2003-09-17 13:53  flepied
 
@@ -215,12 +240,18 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  14_Jan
+
+2003-01-14 20:59  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.9-1mdk
 
 2002-12-22 23:09  flepied
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  23_Dec
+
+2002-12-22 23:09  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.8
 
 2002-12-22 23:08  flepied
@@ -261,6 +292,9 @@
 2002-11-05 13:36  tvignaud
 
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.7.1mdk
+
+2002-11-05 13:36  tvignaud
+
 	* soft/rpm/rpm-helper/trunk/Makefile: - add {add,del}-shell
 	  
 	  - add localsrpm target
@@ -268,6 +302,9 @@
 2002-11-05 13:35  tvignaud
 
 	* soft/rpm/rpm-helper/trunk/AUTHORS: add me
+
+2002-11-05 13:35  tvignaud
+
 	* soft/rpm/rpm-helper/trunk/add-shell,
 	  soft/rpm/rpm-helper/trunk/del-shell: add {add,del}-shell
 
@@ -297,6 +334,9 @@
 2002-08-01 17:39  flepied
 
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.5-1mdk
+
+2002-08-01 17:39  flepied
+
 	* soft/rpm/rpm-helper/trunk/add-service: restart services that
 	  depend of portmap
 
@@ -304,7 +344,13 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  31_Jul
+
+2002-07-31 08:47  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.4.1-1mdk
+
+2002-07-31 08:47  flepied
+
 	* soft/rpm/rpm-helper/trunk/add-group: corrected group add without
 	  a user to add
 
@@ -316,6 +362,9 @@
 2002-07-29 15:25  flepied
 
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.4-1mdk
+
+2002-07-29 15:25  flepied
+
 	* soft/rpm/rpm-helper/trunk/add-user: removed group management
 
 2002-07-29 15:24  flepied
@@ -358,6 +407,9 @@
 
 	* soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
 	  10_Jul
+
+2002-07-10 13:12  flepied
+
 	* soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.2-1mdk
 
 2002-07-10 13:10  flepied
diff --git a/Makefile b/Makefile
index babf782..3d16445 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,24 @@
 PACKAGE = rpm-helper
-VERSION = 0.18.2
+VERSION = 0.18
 SVNPATH = svn+ssh://svn.mandriva.com/svn/soft/rpm/$(PACKAGE)
 
 SCRIPT_FILES = add-user del-user add-service del-service create-file \
 	       add-group del-group add-shell del-shell verify-shell \
-	       add-syslog del-syslog add-webapp del-webapp \
-	       get-free-syslog-facility get-password
+	       add-syslog del-syslog add-webapp del-webapp
 MACROS_FILES = rpm-helper.macros
 FILES        = AUTHORS README README.CVS COPYING ChangeLog Makefile \
                $(SCRIPT_FILES) $(MACROS_FILES:=.in)
 
-pkgdatadir   = /usr/share/$(PACKAGE)
-rpmmacrosdir = /etc/rpm/macros.d
+pkgdatadir  = /usr/share/$(PACKAGE)
+rpmacrosdir = /etc/rpm/macros.d
 
 all:
 	@echo "use make install or make dist"
 
 install: $(MACROS_FILES)
 	install -d -m 755 $(DESTDIR)$(pkgdatadir)
-	cp -p $(SCRIPT_FILES) $(DESTDIR)$(pkgdatadir)
-	install -d -m 755 $(DESTDIR)$(rpmmacrosdir)
+	cp -p $(SCRIPTS) $(DESTDIR)$(pkgdatadir)
+	install -d -m 755 $(DESTDIR)$(rpmacrosdir)
 	install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrosdir)
 
 rpm-helper.macros: rpm-helper.macros.in
@@ -48,10 +47,10 @@ tar:
 
 # rules to build a public distribution
 
-dist: changelog cleandist dir localcopy tar svntag
+dist: changelog cleandist dir localcopy tar
 
 changelog:
-	svn2cl --strip-prefix soft/rpm/$(PACKAGE)/trunk -o ChangeLog || : 
+	svn2cl -o ChangeLog || : 
 	rm -f ChangeLog.bak
 	
 svntag: