aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-07-26 11:29:01 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-07-26 11:29:01 +0000
commit5a50f213d00dd40b984d2475f737355c3e8a8e3e (patch)
treea8d818dcbfe1ee5b429a9398175cbe379789811e
parent4a9c0abc489cf6c559299a56a602f335d15e81f9 (diff)
- tag 0.260.26
-rw-r--r--ChangeLog35
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec7
4 files changed, 43 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index daec520..010f1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2006-07-26 11:28 nanardon
+
+ * soft/rpm/rpm-setup/trunk/ChangeLog,
+ soft/rpm/rpm-setup/trunk/Makefile.am,
+ soft/rpm/rpm-setup/trunk/configure.ac,
+ soft/rpm/rpm-setup/trunk/rpm-mandriva-setup.spec: - 0.26
+
+2006-07-26 08:29 nanardon
+
+ * soft/rpm/rpm-setup/trunk/find-requires.in: - add
+ /usr/share/pkconfig as path where those can live
+
+2006-07-26 08:29 nanardon
+
+ * soft/rpm/rpm-setup/trunk/find-requires.in: - add
+ /usr/share/pkconfig as path where those can live
+
+2006-07-26 08:29 nanardon
+
+ * soft/rpm/rpm-setup/trunk/find-requires.in: - add
+ /usr/share/pkconfig as path where those can live
+
+2006-07-13 09:05 blino
+
+ * soft/rpm/rpm-setup/trunk/configure.ac: 1.25
+
+2006-07-13 09:00 blino
+
+ * soft/rpm/rpm-setup/trunk/rpm-mandriva-setup.spec: 1.25-1mdv2007.0
+
+2006-07-13 08:42 fcrozat
+
+ * soft/rpm/rpm-setup/trunk/macros.in: Force also icon cache
+ generation on uninstall or removed files might be left in cache
+
2006-06-29 15:53 blino
* soft/rpm/rpm-setup/trunk/Makefile.am: really log the whole
diff --git a/Makefile.am b/Makefile.am
index c7cdf39..6185db9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,7 @@ rpm: dist dist-bzip2
rpmbuild -ba --clean --define "_sourcedir `pwd`" rpm-mandriva-setup.spec
.PHONY: ChangeLog
+
ChangeLog:
LC_ALL=C svn2cl --accum
rm -f *.bak
diff --git a/configure.ac b/configure.ac
index 2a191bd..5782b46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.25, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.26, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 8d1896b..3ec35ff 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.25
+%define version 1.26
%define release %mkrel 1
# This can be useful for backport, as rpm-4.2
@@ -91,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Jul 26 2006 Olivier Thauvin <nanardon@mandriva.org> 1.26-1mdv2007.0
+- 1.26
+- pkgconfig file can be located in /usr/share/pkgconfig, looking for it
+ to create requirement (thanks Gotz)
+
* Thu Jul 13 2006 Olivier Blin <oblin@mandriva.com> 1.25-1mdv2007.0
- 1.25:
o Force also icon cache generation on uninstall