[PATCH] Fixed some problems when doing a 'make install_hardest'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



- Makefile: Add NEWRELEASE variable to use it in 'install_rpm'.
            Add --nodeps when 'clean_rpms' is called.
- certmaster.spec: Increment the release number
---
 Makefile        |    5 +++--
 certmaster.spec |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 652b5db..b9e8fba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 VERSION		= 0.25 
 RELEASE		= 1
+NEWRELEASE      = $(shell echo $$(($(RELEASE) + 1)))
 PYTHON		= /usr/bin/python
 
 MESSAGESPOT=po/messages.pot
@@ -62,7 +63,7 @@ install_harder: clean_harder install
 install_hardest: clean_harder clean_rpms rpms install_rpm restart
 
 install_rpm:
-	-rpm -Uvh rpm-build/certmaster-$(VERSION)-$(RELEASE)$(shell rpm -E "%{?dist}").noarch.rpm
+	-rpm -Uvh rpm-build/certmaster-$(VERSION)-$(NEWRELEASE)$(shell rpm -E "%{?dist}").noarch.rpm
 
 restart:
 	-/etc/init.d/certmaster restart
@@ -70,7 +71,7 @@ restart:
 recombuild: install_harder restart
 
 clean_rpms:
-	-rpm -e certmaster
+	-rpm -e --nodeps certmaster
 
 sdist: messages
 	$(PYTHON) setup.py sdist
diff --git a/certmaster.spec b/certmaster.spec
index c3ad279..d979794 100644
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -17,7 +17,7 @@
 Summary: Remote certificate distribution framework
 Name: certmaster
 Version: 0.25 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
-- 
1.6.6.1

_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list


[Index of Archives]     [Fedora Users]     [Linux Networking]     [Fedora Legacy List]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux