diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | macros.in | 2 | ||||
| -rw-r--r-- | rpm-mandriva-setup.spec | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index f345c18..5ba182f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,5 @@ # $Id$ -VERSION := $(shell rpm -q --qf "%{VERSION}\n" --specfile $(PACKAGE).spec | tail -1) -RELEASE := $(shell rpm -q --qf "%{RELEASE}\n" --specfile $(PACKAGE).spec | tail -1) -TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') - macrosfiles = $(RPMALLARCH:=.macros) pkg_data = \ @@ -86,9 +82,6 @@ rpm: dist dist-bzip2 .PHONY: ChangeLog ChangeLog: -cvstag: - cvs tag $(CVSTAGOPT) $(TAG) - CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(macrosfiles) \ macros-perarch \ make_macrosfiles.sh diff --git a/configure.ac b/configure.ac index 3c23b24..e74e466 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id$ AC_PREREQ(2.59) -AC_INIT(rpm-mandriva-setup, 1.5.2, nanardon@mandriva.org) +AC_INIT(rpm-mandriva-setup, 1.5.3, nanardon@mandriva.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9) AC_CONFIG_SRCDIR @@ -193,7 +193,7 @@ then %{_update_mime_database_bin} %{_datadir}/mime > /dev/null || true ; fi \ %{_update_icon_cache_bin} --force --quiet %{_iconsdir}/%{1} || true; fi \ %{nil} -%clean_icon_cache() if [ "$1" = "0" -a -x %{_update_icon_cache_bin} ]; then \ +%clean_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_iconsdir}/%{1}/index.theme ]; then \ %{_update_icon_cache_bin} --force --quiet %{_iconsdir}/%{1} || true ; fi \ %{nil} diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec index 4db524a..d74d8ae 100644 --- a/rpm-mandriva-setup.spec +++ b/rpm-mandriva-setup.spec @@ -1,5 +1,5 @@ %define name rpm-mandriva-setup -%define version 1.5.2 +%define version 1.5.3 %define release %mkrel 1 # This can be usefull for backport as rpm-4.2 |