Hi Simon,
I would prefer slightly modified one (attached),
as your one doesn't seem to pass:
git apply --check
against current upstream SSG content.
Instead of modifying
Release: %{fedorassgrelease}%{?dist
I would prefer modifying fedorassgrelease and keep
Release untouched [*].
See the attachment.
Otherwise looks OK (ACK for me).
Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
P.S.: [*] I know this scenario doesn't correspond to common
practice as used when bumping release in Fedora, but
for now this is preferred. I will have a look to modify
the schema yet it to be more aligned with Fedora release
bumping when making new RPM. Thanks, Jan.
----- Original Message -----
> From: "Simon Lukasik" <[email protected]>
> To: [email protected]
> Sent: Friday, November 15, 2013 5:39:08 PM
> Subject: Re: [PATCH] scap-security-guide in Fedora obsoletes openscap-content
>
> On 11/15/2013 04:59 PM, Shawn Wells wrote:
> > On 11/15/13, 9:57 AM, Šimon Lukašík wrote:
> >> From: Simon Lukasik <[email protected]>
> >>
> >> Openscap-content has been created for Fedora 14 and it becomes
> >> increasingly outdated. The scap-security-guide package in Fedora
> >> has been designed as a next generation of Fedora content.
> >>
> >> With OpenSCAP-0.9.13 release we decided to obsolete openscap-content
> >> and advice users to use scap-security-guide instead. However, we
> >> need to put the obsoletes directive to scap-security-guide.spec
> >> in order to avoid nasty update issues like (rhbz#1028706).
> >> ---
> >> Fedora/scap-security-guide.spec | 6 +++++-
> >> 1 file changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/Fedora/scap-security-guide.spec
> >> b/Fedora/scap-security-guide.spec
> >> index dc21c7d..4a31a5c 100644
> >> --- a/Fedora/scap-security-guide.spec
> >> +++ b/Fedora/scap-security-guide.spec
> >> @@ -9,7 +9,7 @@
> >> Name: scap-security-guide
> >> Version: 0.1
> >> -Release: %{fedorassgrelease}%{?dist}
> >> +Release: %{fedorassgrelease}.1%{?dist}
> >> Summary: Security guidance and baselines in SCAP formats
> >> Group: Applications/System
> >> License: Public Domain
> >> @@ -18,6 +18,7 @@ Source0:
> >> http://fedorapeople.org/~jlieskov/%{name}-%{version}-%{fedorassgrelease
> >> BuildArch: noarch
> >> BuildRequires: libxslt, expat, python, openscap-utils >= 0.9.1,
> >> python-lxml
> >> Requires: xml-common, openscap-utils >= 0.9.1
> >> +Obsoletes: openscap-content < 0:0.9.13
> >> %description
> >> The scap-security-guide project provides a guide for configuration
> >> of the
> >> @@ -53,6 +54,9 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8
> >> %{buildroot}%{_mandir}/en/man
> >> %doc Fedora/LICENSE Fedora/output/ssg-fedora-guide.html
> >> %changelog
> >> +* Fri Nov 15 2013 Šimon Lukašík <[email protected]> - 0.1-3.1
> >> +- Rebuild to obsolete openscap-content package (#1028706)
> >> +
> >> * Tue Oct 22 2013 Jan iankko Lieskovsky <[email protected]> 0.1-3
> >> - Add .gitignore for Fedora output directory
> >> - Set up Fedora release name and CPE based on build system properties
> >
> > This is great news!
>
> Now I am confused. Is this considered to be an ack? :)
>
>
> > Do you envision SSG obsoleting the RHEL package as
> > well?
>
> Not yet.
>
> We ship openscap-content package only in RHEL6. It is slightly different
> to Fedora's openscap-content. The RHEL6 does not change that rapidly,
> thus openscap-content is not becoming that outdated there.
>
> Until the ssg becomes part of supported RHEL6 package set, I will not
> consider obsoleting it. Even afterwards, it might be helpful for some.
> Not mentioning that openscap-content package is used as an example in
> various Red Hat documentations.
>
> Best regards,
>
> --
> Simon Lukasik
> Security Technologies
> _______________________________________________
> scap-security-guide mailing list
> [email protected]
> https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
>From 0f9d841596872a4c9ee7088ea401659241333681 Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <[email protected]>
Date: Fri, 15 Nov 2013 17:50:27 +0100
Subject: [PATCH] From: Simon Lukasik <slukasik at redhat.com>
Openscap-content has been created for Fedora 14 and it becomes
increasingly outdated. The scap-security-guide package in Fedora
has been designed as a next generation of Fedora content.
With OpenSCAP-0.9.13 release we decided to obsolete openscap-content
and advice users to use scap-security-guide instead. However, we
need to put the obsoletes directive to scap-security-guide.spec
in order to avoid nasty update issues like (rhbz#1028706).
Signed-off-by: Jan Lieskovsky <[email protected]>
---
Fedora/scap-security-guide.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Fedora/scap-security-guide.spec b/Fedora/scap-security-guide.spec
index dc21c7d..3dac15d 100644
--- a/Fedora/scap-security-guide.spec
+++ b/Fedora/scap-security-guide.spec
@@ -5,7 +5,7 @@
# file one level up - in the main scap-security-guide directory (instead of
# this one).
-%global fedorassgrelease 3
+%global fedorassgrelease 3.1
Name: scap-security-guide
Version: 0.1
@@ -18,6 +18,7 @@ Source0: http://fedorapeople.org/~jlieskov/%{name}-%{version}-%{fedorassgrelease
BuildArch: noarch
BuildRequires: libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml
Requires: xml-common, openscap-utils >= 0.9.1
+Obsoletes: openscap-content < 0:0.9.13
%description
The scap-security-guide project provides a guide for configuration of the
@@ -53,6 +54,9 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man
%doc Fedora/LICENSE Fedora/output/ssg-fedora-guide.html
%changelog
+* Fri Nov 15 2013 Å imon LukaÅ¡Ãk <slukasik at redhat.com> - 0.1-3.1
+- Rebuild to obsolete openscap-content package (#1028706)
+
* Tue Oct 22 2013 Jan iankko Lieskovsky <[email protected]> 0.1-3
- Add .gitignore for Fedora output directory
- Set up Fedora release name and CPE based on build system properties
--
1.8.3.1
_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
