aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--rpm-helper.spec17
2 files changed, 10 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index f81c143..7058f66 100644
--- a/Makefile
+++ b/Makefile
@@ -73,19 +73,13 @@ buildsrpm:
# rules to build a distributable rpm
-rpm: changelog cvstag dist buildrpm
+rpm: changelog dist buildrpm
-dist: cleandist dir export tar
+dist: cleandist dir tar
-export:
- cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
-
-cvstag:
- cvs tag $(CVSTAGOPT) $(TAG)
-
-changelog: ../common/username
- cvs2cl -U ../common/username -I ChangeLog
+changelog:
+ svn2cl -o ChangeLog
rm -f ChangeLog.bak
- cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
+ svn commit -m "Generated by svn2cl" ChangeLog
# Makefile ends here
diff --git a/rpm-helper.spec b/rpm-helper.spec
index f15000d..741d8fd 100644
--- a/rpm-helper.spec
+++ b/rpm-helper.spec
@@ -1,16 +1,8 @@
-#############################################################################
-# Project : Mandriva Linux
-# Module : rpm-helper
-# File : rpm-helper.spec
-# Version : $Id$
-# Author : Frederic Lepied
-# Created On : Tue Jul 9 08:21:29 2002
-# Purpose : rpm build rules
-#############################################################################
+# $Id$
Summary: Helper scripts for rpm scriptlets
Name: rpm-helper
-Version: 0.15
+Version: 0.16
Release: %mkrel 1
Source0: %name-%version.tar.bz2
License: GPL
@@ -31,8 +23,6 @@ Helper scripts for rpm scriptlets to help create/remove :
%prep
%setup
-%build
-
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall_std LIBDIR=%_datadir/%name
@@ -47,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
%_sys_macros_dir/%name.macros
%changelog
+* Sat Jun 17 2006 Olivier Thauvin <nanardon@mandriva.org> 0.16-1mdv2007.0
+- add webapp macros and scrips (G. Rousse)
+
* Thu Feb 09 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 0.15-1mdk
- add-service: handle case when a service name appears several times.