aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-06-29 20:43:42 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-06-29 20:43:42 +0000
commit43a9c7bde4428d2ca4e52f17779987fa92906816 (patch)
tree00eb97c067df791339dc695f6579c12b970d9781
parent4f06fd0c0acf10d30502aec67947479aabe75bcb (diff)
- tags cleanup1.5.2
-rw-r--r--Makefile.am2
-rw-r--r--rpm-mandriva-setup.spec5
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 4dcfbbd..f345c18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,8 +85,6 @@ rpm: dist dist-bzip2
.PHONY: ChangeLog
ChangeLog:
- cvs2cl -W 400 -I ChangeLog --accum -U ../common/username
- rm -f *.bak
cvstag:
cvs tag $(CVSTAGOPT) $(TAG)
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 4063534..4db524a 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.5.1
+%define version 1.5.2
%define release %mkrel 1
# This can be usefull for backport as rpm-4.2
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jun 29 2006 Olivier Thauvin <nanardon@mandriva.org> 1.5.2-0.1.20060mdk
+- backport scrollkeeper/webapp macros
+
* Thu Oct 6 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.5.1-1mdk
- fix %%py_libdir for lib64 platforms (#18772)
- perl.req: add the proper detection of 'use base qw(Foo::Bar)'