[nocpulse-common] Rebase to nocpulse-common-2.2.7-1.fc19 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Mon Jul 22 07:42:17 UTC 2013 

commit ae5986a776fe879aa65fdbed89cd9d29be7302d2
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jul 22 09:41:55 2013 +0200

    Rebase to nocpulse-common-2.2.7-1.fc19 in rawhide.

 .gitignore           |    1 +
 nocpulse-common.spec |  129 +++++---------------------------------------------
 sources              |    2 +-
 3 files changed, 14 insertions(+), 118 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc04b8d..a3a101f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nocpulse-common-2.1.19.tar.gz
 /nocpulse-common-2.2.1.tar.gz
 /nocpulse-common-2.2.4.tar.gz
 /nocpulse-common-2.2.5.tar.gz
+/nocpulse-common-2.2.7.tar.gz
diff --git a/nocpulse-common.spec b/nocpulse-common.spec
index 2f08f0e..73b022d 100644
--- a/nocpulse-common.spec
+++ b/nocpulse-common.spec
@@ -1,6 +1,8 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
 Name:         nocpulse-common
-Version:      2.2.5
-Release:      2%{?dist}
+Version:      2.2.7
+Release:      1%{?dist}
 Summary:      NOCpulse common
 License:      GPLv2
 URL:          https://fedorahosted.org/spacewalk
@@ -10,11 +12,7 @@ Group:        Applications/System
 Buildroot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre):  httpd, /usr/sbin/useradd
 Requires(post): openssh
-%if 0%{?fedora} > 17
-Requires(post): /usr/sbin/runuser
-%else
-Requires(post): /sbin/runuser
-%endif
+Requires(post): %{sbinpath}/runuser
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # merging this two packages together
 # not backward compatible => no Provides:
@@ -132,7 +130,7 @@ fi
 
 if [ ! -f %{identity} ]
 then
-    /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
+    %{sbinpath}/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
 fi
 
 %files
@@ -154,8 +152,12 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 2.2.5-2
-- Perl 5.18 rebuild
+* Fri Mar 22 2013 Michael Mraka <michael.mraka at redhat.com> 2.2.7-1
+- 919468 - fixed path in file based Requires
+
+* Fri Mar 08 2013 Milan Zazrivec <mzazrivec at redhat.com> 2.2.6-1
+- Fedora 19 does not provide /sbin/runuser
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
 
 * Fri Nov 02 2012 Miroslav Suchý <msuchy at redhat.com> 2.2.5-1
 - Fedora 19 does not provide /sbin/runuser
@@ -197,110 +199,3 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Feb 18 2011 Jan Pazdziora 2.1.20-1
 - Localize the filehandle globs; also use three-parameter opens.
 
-* Thu Feb 11 2010 Miroslav Suchý <msuchy at redhat.com> 2.1.19-1
-- Fedora guys do not want to have migration code in theirs spec
- 
-* Thu Sep 17 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.18-1
-- 476851 - removal of tables: rhn_db_environment, rhn_environment
-
-* Mon Jul 27 2009 John Matthews <jmatthew at redhat.com> 2.1.17-1
-- specify login shell for useradd (msuchy at redhat.com)
-- 457011 - add warning to top of file. This file should not be edited manualy
-  (msuchy at redhat.com)
-- 457011 - create NOCpulse-ini - tool to handle NOCpulse.ini
-  (msuchy at redhat.com)
-
-* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 2.1.16-1
-- don't print error when files to be moved don't exist (mzazrivec at redhat.com)
-- Don't to migrate log files from /home/nocpulse/var (mzazrivec at redhat.com)
-
-* Tue Jun 16 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.15-1
-- fix problem when nocpulse user do not exist
-
-* Wed Jun 03 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.1.14-1
-- switch nocpulse to a system user if needed
-
-* Mon May 11 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.1.13-1
-- 498257 - migrate existing files into new nocpulse homedir
-
-* Mon May 11 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.12-1
-- 499568 - require scout_shared_key for requesting NOCpulse.ini
-
-* Wed Apr 22 2009 Jan Pazdziora 2.1.10-1
-- 497064 - do not inherit crond's stdin
-
-* Fri Apr 10 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.9-1
-- 494538 - remove the dependecy of rhnmd on nocpulse-common
-
-* Wed Mar 25 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.8-1
-- be sure that nocpulse home is correct after upgrade
-
-* Thu Mar  5 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.7-1
-- keep last 5 logs in logrotate
-
-* Wed Mar  4 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.6-1
-- 435203 - set /var/log/nocpulse writeable by apache user
-
-* Thu Feb 19 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.5-1
-- 435415 - redirect nocops emails to root
-
-* Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> 2.1.2-1
-- fix Requires so we need the perl version we built against
-
-* Wed Dec 10 2008 Miroslav Suchy <msuchy at redhat.com> 2.1.1-1
-- 474551 - obsolete nslogs and ConfigPusher-General
-- bump up version for 0.4 branch
-
-* Tue Nov  4 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.14-1
-- 469708 - obsolete newer np-config
-
-* Fri Oct 31 2008 Miroslav Suchy 2.0.13-1
-- 469222 - add .ssh directory
-
-* Thu Oct 30 2008 Miroslav Suchy 2.0.10-1
-- renaming package macro to package_name 
-- using _var instead of localstatedir
-
-* Wed Oct 29 2008 Miroslav Suchy 2.0.9-1
-- BZ 468514 - removing tcsh as explicit shell
-
-* Fri Oct 24 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.8-1
-- add direct link to tar.gz
-
-* Thu Oct 16 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.6-1
-- remove docdir from %%build
-- run %%pre only if we install package
-
-* Mon Aug 18 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.4-1
-- fix perl modules location
-
-* Tue Aug 12 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.1-2
-- make passwd silent
-- fix runuser command
-
-* Mon Aug 11 2008 Miroslav Suchy <msuchy at redhat.com>
-- fix %%files section
-
-* Fri Aug  8 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.1-1
-- add README.upgrade-rhn
-
-* Fri Aug  8 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.1-0
-- rewrite %%description
-- add logrotate script
-- rename to nocpulse-common
-- merge with np-config
-
-* Fri Jul  4 2008 Dan Horak <dan[at]danny.cz> 1.17.11-7
-- clean spec for initial Fedora package
-
-* Thu Jun 26 2008 Miroslav Suchy <msuchy at redhat.com>
-- moving directories to complain LSB
-- removing nocops user
-- cleaning up spec file
-- remove setting up root password
-
-* Thu Jun 19 2008 Miroslav Suchy <msuchy at redhat.com>
-- migrating nocpulse home dir (BZ 202614)
-
-* Wed May 21 2008 Miroslav Suchy <msuchy at redhat.com> 1.17.11-6
-- migrate to brew / dist-cvs
diff --git a/sources b/sources
index a5d5ca9..c1068de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe56096a578b0876eae32ca4bce20e2b  nocpulse-common-2.2.5.tar.gz
+e79eed0dd14629ec9a34f08e3214a030  nocpulse-common-2.2.7.tar.gz

More information about the scm-commits mailing list