rpms/openscap/F-13 openscap-0.5.8-config.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 openscap.spec, 1.11, 1.12 sources, 1.8, 1.9 openscap-0.5.6-uninit.patch, 1.1, NONE

Wed Mar 24 15:10:59 UTC 2010

Author: pvrabec

Update of /cvs/extras/rpms/openscap/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10917

Modified Files:
	.cvsignore openscap.spec sources 
Added Files:
	openscap-0.5.8-config.patch 
Removed Files:
	openscap-0.5.6-uninit.patch 
Log Message:
upgrade


openscap-0.5.8-config.patch:
 oscap-scan.cron |    2 +-
 oscap-scan.sys  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openscap-0.5.8-config.patch ---
diff -up openscap-0.5.8/dist/fedora/oscap-scan.cron.config openscap-0.5.8/dist/fedora/oscap-scan.cron
--- openscap-0.5.8/dist/fedora/oscap-scan.cron.config	2010-03-24 15:57:03.646108236 +0100
+++ openscap-0.5.8/dist/fedora/oscap-scan.cron	2010-03-24 15:57:26.986117969 +0100
@@ -5,7 +5,7 @@
 # sent to root mail. Please configure oscap-scan options before you use it!
 ##########
 
-#OPTIONS="/usr/share/openscap/scap-fedora12-oval.xml"
+OPTIONS="/usr/share/openscap/scap-fedora13-oval.xml"
 PROG="/usr/bin/oscap-scan"
 if [ x"$OPTIONS" == "x" ]
 then
diff -up openscap-0.5.8/dist/fedora/oscap-scan.sys.config openscap-0.5.8/dist/fedora/oscap-scan.sys
--- openscap-0.5.8/dist/fedora/oscap-scan.sys.config	2010-03-24 15:57:44.733108831 +0100
+++ openscap-0.5.8/dist/fedora/oscap-scan.sys	2010-03-24 15:57:56.122129104 +0100
@@ -1,4 +1,4 @@
 
 #oscap-scan command line options:
-#OPTIONS="-q --result-file /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora12-oval.xml"
+OPTIONS="-q --result-file /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora13-oval.xml"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Jan 2010 16:10:41 -0000	1.8
+++ .cvsignore	24 Mar 2010 15:10:58 -0000	1.9
@@ -1 +1 @@
-openscap-0.5.6.tar.gz
+openscap-0.5.8.tar.gz


Index: openscap.spec
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-13/openscap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openscap.spec	5 Jan 2010 11:06:16 -0000	1.11
+++ openscap.spec	24 Mar 2010 15:10:59 -0000	1.12
@@ -2,18 +2,18 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.5.6
-Release:        2%{?dist}
+Version:        0.5.8
+Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.open-scap.org/
-Source0:	http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz
-Patch1:         openscap-0.5.6-uninit.patch
+Source0:        http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz
+Patch1:         openscap-0.5.8-config.patch      
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  swig pcre-devel libxml2-devel
 BuildRequires:  rpm-devel
-BuildRequires:  libnl-devel
+BuildRequires:	libnl-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -52,17 +52,35 @@ BuildRequires:  perl-devel
 The %{name}-perl package contains the bindings so that %{name}
 libraries can be used by perl.
 
+%package        utils
+Summary:        Openscap utilities
+Group:          Applications/System
+Requires:       %{name} = %{version}-%{release}
+Requires(post):  chkconfig
+Requires(preun): chkconfig initscripts
+BuildRequires:   libcurl-devel
+
+%description    utils
+The %{name}-utils package contains various utilities based on %{name} library.
+
 %prep
 %setup -q
-%patch1 -p1 -b .uninit
+%patch1 -p1
 
 %build
-%configure
+%configure --disable-debug
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
+install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -p -m 755 dist/fedora/oscap-scan.init $RPM_BUILD_ROOT%{_initrddir}/oscap-scan
+install -p -m 644 dist/fedora/oscap-scan.sys  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/oscap-scan
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %clean
@@ -72,6 +90,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
+
+%post utils
+/sbin/chkconfig --add oscap-scan
+
+%preun utils
+if [ $1 -eq 0 ]; then
+   /sbin/service oscap-scan stop > /dev/null 2>&1
+   /sbin/chkconfig --del oscap-scan
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -93,18 +122,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 
+%files utils
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan
+%{_initrddir}/oscap-scan
+%{_datadir}/openscap/*
+%{_mandir}/man8/*
+%{_bindir}/*
 
-%changelog
-* Tue Jan 05 2010 Peter Vrabec <pvrabec at redhat.com> 0.5.6-2
-- fixing uninitialized variable
 
-* Mon Jan 04 2010 Peter Vrabec <pvrabec at redhat.com> 0.5.6-1
+%changelog
+* Wed Mar 24 2010 Peter Vrabec <pvrabec at redhat.com> 0.5.8-1
 - upgrade
+- configure initscipt and cronjob script
 
-* Sat Jan  2 2010 Tomas Mraz <tmraz at redhat.com> 0.5.5-2
-- rebuilt with new librpm
+* Fri Feb 26 2010 Peter Vrabec <pvrabec at redhat.com> 0.5.7-1
+- upgrade
+- new utils package
 
-* Thu Nov 12 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.5-1
+* Mon Jan 04 2010 Peter Vrabec <pvrabec at redhat.com> 0.5.6-1
 - upgrade
 
 * Tue Sep 29 2009 Peter Vrabec <pvrabec at redhat.com> 0.5.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openscap/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Jan 2010 16:10:41 -0000	1.8
+++ sources	24 Mar 2010 15:10:59 -0000	1.9
@@ -1 +1 @@
-f3c922a0ae4e7ca6b21ddc6d706f8146  openscap-0.5.6.tar.gz
+cb62e24375b5a3dd01e5675d5782b9b6  openscap-0.5.8.tar.gz


--- openscap-0.5.6-uninit.patch DELETED ---

