aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--Makefile8
-rw-r--r--rpm-helper.macros.in7
3 files changed, 24 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..a4d41e6
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,18 @@
+2007-03-06 Guillaume Rousse <guillomovitch@mandriva.org> 0.18.3
+
+ * prefix all rpm macros with underscore for coherency
+ * README files cleanup
+ * switch to a manual Changelog
+
+2007-03-05 Guillaume Rousse <guillomovitch@mandriva.org> 0.18.2
+
+ * fix rpm macros definitions
+
+2007-03-05 Guillaume Rousse <guillomovitch@mandriva.org> 0.18.1
+
+ * fix a typo in makefile preventing installation
+
+2007-03-05 Guillaume Rousse <guillomovitch@mandriva.org> 0.18
+
+ * new helper scripts: get-free-syslog-facility and get-password
+ * Makefile cleanup
diff --git a/Makefile b/Makefile
index babf782..ce95cda 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ SCRIPT_FILES = add-user del-user add-service del-service create-file \
add-syslog del-syslog add-webapp del-webapp \
get-free-syslog-facility get-password
MACROS_FILES = rpm-helper.macros
-FILES = AUTHORS README README.CVS COPYING ChangeLog Makefile \
+FILES = AUTHORS README COPYING ChangeLog Makefile \
$(SCRIPT_FILES) $(MACROS_FILES:=.in)
pkgdatadir = /usr/share/$(PACKAGE)
@@ -48,11 +48,7 @@ tar:
# rules to build a public distribution
-dist: changelog cleandist dir localcopy tar svntag
+dist: cleandist dir localcopy tar svntag
-changelog:
- svn2cl --strip-prefix soft/rpm/$(PACKAGE)/trunk -o ChangeLog || :
- rm -f ChangeLog.bak
-
svntag:
svn cp -m 'version $(VERSION)' $(SVNPATH)/trunk $(SVNPATH)/tags/v$(VERSION)
diff --git a/rpm-helper.macros.in b/rpm-helper.macros.in
index fe1ce81..618faeb 100644
--- a/rpm-helper.macros.in
+++ b/rpm-helper.macros.in
@@ -3,14 +3,15 @@
%_rpm_helper_dir @pkgdatadir@
%_get_password_helper %_rpm_helper_dir/get-password
-%get_password() %(%_get_password_helper %{1})
+%_get_password() %(%_get_password_helper %{1})
%_get_free_syslog_facility_helper %_rpm_helper_dir/get-free-syslog-facility
-%get_free_syslog_facility() %(%_get_free_syslog_facility_helper)
+%_get_free_syslog_facility() %(%_get_free_syslog_facility_helper)
%_create_ghostfile_helper %_rpm_helper_dir/create-file
-%create_ghostfile() %_create_ghostfile_helper %{name} $1 %{1} %{2} %{3} %{4} \
+%_create_ghostfile() %_create_ghostfile_helper %{name} $1 %{1} %{2} %{3} %{4} \
%{nil}
+%create_ghostfile %_create_ghostfile
# initscripts macros
%_add_service_helper %_rpm_helper_dir/add-service