[perl-Satcon] Rebase to perl-Satcon-1.20-1.fc19 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Mon Jul 22 07:43:36 UTC 2013


commit 94d13526e203a52343605a0461b827066fcdd943
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jul 22 09:43:24 2013 +0200

    Rebase to perl-Satcon-1.20-1.fc19 in rawhide.

 .gitignore       |    1 +
 perl-Satcon.spec |   50 +++++++++-----------------------------------------
 sources          |    2 +-
 3 files changed, 11 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a16f37d..853b2ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 perl-Satcon-1.11.tar.gz
 /perl-Satcon-1.14.tar.gz
 /perl-Satcon-1.19.tar.gz
+/perl-Satcon-1.20.tar.gz
diff --git a/perl-Satcon.spec b/perl-Satcon.spec
index f6a4bb0..fd2742f 100644
--- a/perl-Satcon.spec
+++ b/perl-Satcon.spec
@@ -1,7 +1,9 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
 Name:           perl-Satcon
 Summary:        Framework for configuration files
-Version:        1.19
-Release:        6%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            https://fedorahosted.org/spacewalk
@@ -10,7 +12,7 @@ BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Source0:        https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 BuildRequires:  perl(ExtUtils::MakeMaker)
-Requires:       /sbin/restorecon
+Requires:       %{sbinpath}/restorecon
 
 %description
 Framework for generating config files during installation.
@@ -40,26 +42,15 @@ make test
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc README LICENSE 
 %{perl_vendorlib}/*
 %{_bindir}/*
 
 %changelog
-* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.19-6
-- Perl 5.18 rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 1.19-3
-- Perl 5.16 rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Fri Mar 22 2013 Michael Mraka <michael.mraka at redhat.com> 1.20-1
+- 919468 - fixed path in file based Requires
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+- %%defattr is not needed since rpm 4.4
 
 * Tue Jul 19 2011 Jan Pazdziora 1.19-1
 - Updating the copyright years.
@@ -93,26 +84,3 @@ rm -rf $RPM_BUILD_ROOT
 - We need to check the return value of GetOptions and die if the parameters
   were not correct.
 
-* Wed Nov 25 2009 Miroslav Suchý <msuchy at redhat.com> 1.11-1
-- 520441 - don't apply ExtUtils::MY->fixin(shift) to perl executables
-
-* Tue Dec 16 2008 Miroslav Suchý <msuchy at redhat.com> 1.10-1
-- remove satcon-make-rpm.pl
-
-* Thu Nov 20 2008 Jan Pazdziora 1.9-1
-- make satcon-deploy-tree.pl SELinux-aware
-
-* Wed Oct 29 2008 Miroslav Suchý <msuchy at redhat.com> 1.8-1
-- BZ 466777 - add link to tgz, add LICENSE file
-* Thu Oct 23 2008 Miroslav Suchý <msuchy at redhat.com> 1.7-1
-- remove explicit VERSION
-* Mon Oct 13 2008 Miroslav Suchý <msuchy at redhat.com> 1.6-1
-- edit comment for URL
-* Mon Aug  4 2008 Jan Pazdziora 1.3-11
-- rebuild
-* Fri Apr 27 2007 Matthew Davis <mdavis at redhat.com> - 1.3-7
-- Backup config files
-* Tue Jul 20 2004 Robin Norwood <rnorwood at redhat.com> - 1.2
-- New Satcon version - 1.2
-* Wed May 05 2004 Chip Turner <cturner at redhat.com> - 1.1-2
-- Specfile autogenerated.
diff --git a/sources b/sources
index 18d2284..fab20b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b9b5b7f1fcba04aa781d07697838fb8  perl-Satcon-1.19.tar.gz
+d69460a45fa12e96467e4dcc9dc7507a  perl-Satcon-1.20.tar.gz


More information about the scm-commits mailing list