rpms/perl-Test-AutoBuild/devel .cvsignore, 1.2, 1.3 perl-Test-AutoBuild.spec, 1.1, 1.2 sources, 1.2, 1.3 Test-AutoBuild-remove-yumarch.patch, 1.1, NONE

Daniel P. Berrange (berrange) fedora-extras-commits at redhat.com
Sun Dec 9 01:56:53 UTC 2007


Author: berrange

Update of /cvs/extras/rpms/perl-Test-AutoBuild/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18148

Modified Files:
	.cvsignore perl-Test-AutoBuild.spec sources 
Removed Files:
	Test-AutoBuild-remove-yumarch.patch 
Log Message:
Update to 1.2.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-AutoBuild/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2006 22:19:25 -0000	1.2
+++ .cvsignore	9 Dec 2007 01:56:15 -0000	1.3
@@ -1 +1,4 @@
-Test-AutoBuild-1.2.0.tar.gz
+Test-AutoBuild-1.2.1.tar.gz
+.build*
+noarch
+perl-Test-AutoBuild-*.rpm


Index: perl-Test-AutoBuild.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-AutoBuild.spec	14 Sep 2006 22:19:25 -0000	1.1
+++ perl-Test-AutoBuild.spec	9 Dec 2007 01:56:15 -0000	1.2
@@ -1,6 +1,7 @@
 
 %bcond_without  fedora
 %define appname Test-AutoBuild
+%define with_selinux 0
 
 # This macro is used for the continuous automated builds. It just
 # allows an extra fragment based on the timestamp to be appended
@@ -10,13 +11,12 @@
 
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
-Version: 1.2.0
-Release: 3%{_extra_release}
-License: GPL
+Version: 1.2.1
+Release: 1%{_extra_release}
+License: GPLv2+
 Group: Development/Tools
 Url: http://autobuild.org/
 Source: http://www.cpan.org/authors/id/D/DA/DANBERR/%{appname}-%{version}.tar.gz
-Patch1: Test-AutoBuild-remove-yumarch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
@@ -37,12 +37,14 @@
 BuildRequires: /usr/bin/hg
 BuildRequires: /usr/bin/svk
 BuildRequires:  fedora-usermgmt-devel
+%if %{with_selinux}
+BuildRequires: selinux-policy-devel
+%endif
 
 # For Test::AutoBuild::Stage::ISOBuilder
 Requires: /usr/bin/mkisofs
 # For Test::AutoBuild::Stage::Yum
-# NB, removed by %patch1
-#Requires: /usr/bin/yum-arch
+Requires: /usr/bin/yum-arch
 # For Test::AutoBuild::Stage::CreateRepo
 Requires: /usr/bin/createrepo
 # For Test::AutoBuild::Stage::Apt
@@ -50,6 +52,11 @@
 # For Test::AutoBuild::Publisher::XSLTransform
 Requires: /usr/bin/xsltproc
 
+%if %{with_selinux}
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
+%endif
+
 %package account
 Summary: User account and directory structure for running builder
 Group: Development/Tools
@@ -57,6 +64,10 @@
 Requires: perl-%{appname} = %{version}-%{release}
 %{?FE_USERADD_REQ}
 
+%if %{with_selinux}
+Requires(post): policycoreutils
+%endif
+
 %package cvs
 Summary: CVS source repository integration for autobuild engine
 Group: Development/Tools
@@ -98,7 +109,7 @@
 Url: http://autobuild.org/
 Requires: perl-%{appname} = %{version}-%{release}
 # No RPMs of Perforce so we can't add a formal dep :-(
-# User willjust have to download p4 binary direct rom perforce.com
+# User will just have to download p4 binary direct from perforce.com
 #Requires: perforce
 
 
@@ -125,21 +136,21 @@
 Test-AutoBuild is a Perl framework for performing continuous, unattended,
 automated software builds.
 
-This sub-package provides the module for integrating with the Mercurial 
+This sub-package provides the module for integrating with the Mercurial
 version control system
 
 %description subversion
 Test-AutoBuild is a Perl framework for performing continuous, unattended,
 automated software builds.
 
-This sub-package provides the module for integrating with the Subversion 
+This sub-package provides the module for integrating with the Subversion
 version control system
 
 %description tla
 Test-AutoBuild is a Perl framework for performing continuous, unattended,
 automated software builds.
 
-This sub-package provides the module for integrating with the GNU Arch 
+This sub-package provides the module for integrating with the GNU Arch
 version control system
 
 %description perforce
@@ -162,30 +173,35 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
-%patch1 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-%__make
+%__make \
+  WITH_SELINUX=%{with_selinux}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
 
 %__make install \
+  WITH_SELINUX=%{with_selinux} \
   PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
   sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
   INSTALLVENDORMAN5DIR=$RPM_BUILD_ROOT%{_mandir}/man5
 find $RPM_BUILD_ROOT -name perllocal.pod -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name .packlist -exec rm -f {} \;
-%__cp $RPM_BUILD_ROOT%{_sysconfdir}/auto-build.d/auto-build.conf $RPM_BUILD_ROOT%{_sysconfdir}/auto-build.d/auto-build.conf-example
+%__cp $RPM_BUILD_ROOT%{_sysconfdir}/auto-build.d/auto-build.conf \
+  $RPM_BUILD_ROOT%{_sysconfdir}/auto-build.d/auto-build.conf-example
 
 # Create various bits wanted for the -account subRPM
-$RPM_BUILD_ROOT%{_bindir}/auto-build-make-root $RPM_BUILD_ROOT%{_localstatedir}/lib/builder
+$RPM_BUILD_ROOT%{_bindir}/auto-build-make-root \
+  $RPM_BUILD_ROOT%{_localstatedir}/lib/builder
 
-echo "/1 :pserver:anonymous at cvs.gna.org:2401/cvs/testautobuild A" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.cvspass
+echo "/1 :pserver:anonymous at cvs.gna.org:2401/cvs/testautobuild A" \
+  >> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.cvspass
 %__chmod 0600 $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.cvspass
 
-echo "%%_topdir %{_localstatedir}/lib/builder/package-root/rpm" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.rpmmacros
+echo "%%_topdir %{_localstatedir}/lib/builder/package-root/rpm" \
+  >> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.rpmmacros
 
 %check
 make test
@@ -204,18 +220,35 @@
                     -c 'Test-AutoBuild build engine' -g builder builder &>/dev/null || :
 fi
 
+%post
+# Always run, even on upgrade so we reload it
+%if %{with_selinux}
+/usr/sbin/semodule -i %{_datadir}/selinux/packages/auto-build/auto-build.pp >/dev/null
+fixfiles -R %{name} restore
+%endif
+
 %postun account
 %__fe_userdel builder &>/dev/null || :
 %__fe_groupdel builder &>/dev/null || :
 
+%post account
+%if %{with_selinux}
+fixfiles -R %{name}-account restore
+%endif
+
+%postun
+# Unload if last module
+%if %{with_selinux}
+if [ $1 -eq 0 ]; then
+  /usr/sbin/semodule -r autobuild >/dev/null
+fi
+%endif
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS
-%doc README
-%doc COPYING
-%doc CHANGES
-%doc UPGRADING
+%doc AUTHORS README LICENSE CHANGES UPGRADING
 %doc doc/*
+%doc examples
 
 # Man pages
 %{_mandir}/man1/*
@@ -236,7 +269,11 @@
 
 # Scripts & modules
 %attr(0755,root,root) %{_bindir}/auto-build
+%if %{with_selinux}
+%attr(0755,root,root) %{_bindir}/auto-build-secure
+%endif
 %attr(0755,root,root) %{_bindir}/auto-build-make-root
+%attr(0755,root,root) %{_bindir}/auto-build-clean-root
 %dir %{perl_vendorlib}/Test
 %{perl_vendorlib}/Test/AutoBuild.pm
 %dir %{perl_vendorlib}/Test/AutoBuild
@@ -255,6 +292,13 @@
 %{perl_vendorlib}/Test/AutoBuild/Monitor/*.pm
 %dir %{perl_vendorlib}/Test/AutoBuild/Publisher
 %{perl_vendorlib}/Test/AutoBuild/Publisher/*.pm
+%dir %{perl_vendorlib}/Test/AutoBuild/Command
+%{perl_vendorlib}/Test/AutoBuild/Command/*.pm
+
+%if %{with_selinux}
+# SELinux policy
+%{_datadir}/selinux/packages/auto-build/auto-build.pp
+%endif
 
 %files cvs
 %defattr(-,root,root)
@@ -297,7 +341,10 @@
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
-* Thu Sep 14 2006 Daniel berrange <dan at berrange.com> - 1.2.0-3
+* Sat Dec  8 2007 Daniel P. Berrange <berrange at redhat.com> - 1.2.1-1.fc8
+- Updated to new release
+
+* Thu Sep 14 2006 Daniel Berrange <dan at berrange.com> - 1.2.0-3
 - Added <perlvendorlib>/Test directory to list of owned dirs
 
 * Sun Sep 10 2006 Daniel Berrange <dan at berrange.com> - 1.2.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-AutoBuild/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2006 22:19:25 -0000	1.2
+++ sources	9 Dec 2007 01:56:15 -0000	1.3
@@ -1 +1 @@
-7c1d0e9aaa9f9b19b363f31963d5f240  Test-AutoBuild-1.2.0.tar.gz
+c49eee39dbc1c1314cf6e4043fc9276a  Test-AutoBuild-1.2.1.tar.gz


--- Test-AutoBuild-remove-yumarch.patch DELETED ---




More information about the fedora-extras-commits mailing list