This commit is contained in:
Peter Vrabec 2011-03-11 16:41:14 +01:00
parent f9710a2bb0
commit 7741fe9da7
3 changed files with 17 additions and 9 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ openscap-0.6.0.tar.gz
/openscap-0.6.7.tar.gz /openscap-0.6.7.tar.gz
/openscap-0.6.8.tar.gz /openscap-0.6.8.tar.gz
/openscap-0.7.0.tar.gz /openscap-0.7.0.tar.gz
/openscap-0.7.1.tar.gz

View File

@ -2,7 +2,7 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: openscap Name: openscap
Version: 0.7.0 Version: 0.7.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Set of open source libraries enabling integration of the SCAP line of standards Summary: Set of open source libraries enabling integration of the SCAP line of standards
Group: System Environment/Libraries Group: System Environment/Libraries
@ -28,6 +28,7 @@ Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libxml2-devel Requires: libxml2-devel
Requires: pkgconfig
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -47,6 +48,7 @@ libraries can be used by python.
Summary: Perl bindings for %{name} Summary: Perl bindings for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl-devel BuildRequires: perl-devel
%description perl %description perl
@ -85,7 +87,7 @@ sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install INSTALL='install -p' DESTDIR=$RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@ -93,11 +95,11 @@ install -p -m 755 dist/fedora/oscap-scan.init $RPM_BUILD_ROOT%{_initrddir}/oscap
install -p -m 644 dist/fedora/oscap-scan.sys $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/oscap-scan install -p -m 644 dist/fedora/oscap-scan.sys $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/oscap-scan
# create symlinks to default content # create symlinks to default content
ln -s %{_datadir}/openscap/scap-fedora14-oval.xml %{buildroot}/%{_datadir}/openscap/scap-oval.xml ln -s %{_datadir}/openscap/scap-fedora14-oval.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-oval.xml
ln -s %{_datadir}/openscap/scap-fedora14-xccdf.xml %{buildroot}/%{_datadir}/openscap/scap-xccdf.xml ln -s %{_datadir}/openscap/scap-fedora14-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-xccdf.xml
# bash-completion script # bash-completion script
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d
install -pm 644 dist/bash_completion.d/oscap $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/oscap install -pm 644 dist/bash_completion.d/oscap $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/oscap
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@ -125,6 +127,9 @@ fi
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libexecdir}/* %{_libexecdir}/*
%dir %{_datadir}/openscap
%dir %{_datadir}/openscap/schemas
%dir %{_datadir}/openscap/xsl
%{_datadir}/openscap/schemas/* %{_datadir}/openscap/schemas/*
%{_datadir}/openscap/xsl/* %{_datadir}/openscap/xsl/*
@ -139,7 +144,7 @@ fi
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc docs/{html,latex,examples}/ %doc docs/{html,examples}/
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
@ -147,8 +152,8 @@ fi
%files utils %files utils
%defattr(-,root,root,-) %defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan %config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan
%doc docs/oscap-scan.cron
%{_initrddir}/oscap-scan %{_initrddir}/oscap-scan
%{_datadir}/openscap/oscap-scan.cron
%{_mandir}/man8/* %{_mandir}/man8/*
%{_bindir}/* %{_bindir}/*
%{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d
@ -162,8 +167,10 @@ fi
%{_datadir}/openscap/scap-xccdf.xml %{_datadir}/openscap/scap-xccdf.xml
%{_datadir}/openscap/scap-fedora14-xccdf.xml %{_datadir}/openscap/scap-fedora14-xccdf.xml
%changelog %changelog
* Fri Mar 11 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.1-1
- upgrade
* Thu Feb 10 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.0-1 * Thu Feb 10 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.0-1
- upgrade - upgrade

View File

@ -1 +1 @@
e556604cfeadc690b32d6dc268812b80 openscap-0.7.0.tar.gz 45f856c62855912416411d8d1593fc8c openscap-0.7.1.tar.gz