add pld-builder-chroot to sysinfo/Requirename to prevent it being removed

[packages/pld-builder.git] / pld-builder.spec

diff --git a/pld-builder.spec b/pld-builder.spec
index cd82bcde087c845fbbaf4e892b4ff8ff9e078923..2e6d33f8176450b939e0570acf772382e40ae037 100644 (file)
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -1,21 +1,14 @@
-%define                snap    20111127
-Summary:       PLD RPM builder environment
+%define                snap    20141202
+Summary:       PLD Linux RPM builder environment
 Summary(pl.UTF-8):     Środowisko budowniczego pakietów RPM dla PLD
 Name:          pld-builder
-Version:       0.5.%{snap}
-Release:       1
+Version:       0.6.%{snap}
+Release:       2
 License:       GPL
 Group:         Development/Building
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: e9aeb082ad8f2b7d653b24a17ef87b7f
-Source1:       %{name}.init
-Source2:       %{name}.sysconfig
-Source3:       poldek.conf
-Source4:       rpm.macros
-Source5:       crontab
-Source6:       procmailrc
-Source7:       sudo
-URL:           http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
+# Source0-md5: 2fae9f6f0db55331306ed5351219fdcb
+URL:           http://git.pld-linux.org/projects/pld-builder.new
 BuildRequires: python
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.469
@@ -46,6 +39,23 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysconfdir     /etc/pld-builder
 %define                _datadir        /usr/share/%{name}
 
+# ensure these packaegs are never removed
+%define keep_packages() { \
+       f=/etc/rpm/sysinfo/Requirename; \
+       for pkg in %*; do \
+               grep -q "^$pkg$" $f && continue; \
+               echo $pkg >> $f; \
+       done; \
+}
+
+# remove packages from keep
+%define undo_keep_packages() { \
+       f=/etc/rpm/sysinfo/Requirename; \
+       for pkg in %*; do \
+               %{__sed} -i -e "/^$pkg$/d" $f; \
+       done; \
+}
+
 %description
 PLD RPM builder environment. This is the freshest "new" builder.
 
@@ -67,7 +77,7 @@ http://cvs.pld-linux.org/cgi-bin/cvsweb/builder_ng/
 Summary:       PLD Builder
 Summary(pl.UTF-8):     Budowniczy PLD
 Group:         Development/Building
-%pyrequires_eq python-modules
+Requires:      python-modules
 
 %description -n python-pld-builder
 PLD Builder Python code.
@@ -84,20 +94,22 @@ Requires(pre):      /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires:      basesystem
 Requires:      bash
 Requires:      filesystem >= 3.0-33
 Requires:      mount
 Requires:      poldek >= 0.21-0.20070703.00.16
 Requires:      rpm-build
+Requires:      time
 Requires:      tmpwatch
 # NOTE: vserver-packages is usually hidden, so you must install it manually with --noignore
-Requires:      basesystem
 Requires:      vserver-packages
 Provides:      group(builder)
 Provides:      user(builder)
 # for srpm builder
-Requires:      cvs-client
+Requires:      git-core
 Requires:      rpm-build-tools
+Requires:      rpm-specdump
 
 %description chroot
 This is the package to be installed in builder chroot.
@@ -107,6 +119,11 @@ Ten pakiet należy zainstalować w środowisku chroot buildera.
 
 %prep
 %setup -q
+
+for a in config/*.dist; do
+       mv $a ${a%.dist}
+done
+
 %{__sed} -i -e '
        /^root_dir/s,=.*,= "%{_sharedstatedir}/%{name}",
        /^conf_dir/s,=.*,= "%{_sysconfdir}",
@@ -144,30 +161,26 @@ cp -a admin/*.sh $RPM_BUILD_ROOT%{_datadir}/admin
 install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name}/{spool/{buildlogs,builds,ftp,notify},lock},/etc/{sysconfig,rc.d/init.d}}
 install -d $RPM_BUILD_ROOT/home/services/builder/.gnupg
 install -d $RPM_BUILD_ROOT/home/services/builder/.ssh
-install -d $RPM_BUILD_ROOT/home/services/builder/rpm/{BUILD,RPMS,SRPMS,SPECS,SOURCES,packages/CVS}
+install -d $RPM_BUILD_ROOT/home/services/builder/rpm/{BUILD,RPMS,SRPMS,SPECS,SOURCES,packages}
 install -d $RPM_BUILD_ROOT/var/cache/%{name}/ready
 ln -s %{_bindir}/builder $RPM_BUILD_ROOT/home/services/builder/rpm/packages
 
-echo "packages" > $RPM_BUILD_ROOT/home/services/builder/rpm/packages/CVS/Repository
-echo ":pserver:cvs@cvs.pld-linux.org:/cvsroot" > $RPM_BUILD_ROOT/home/services/builder/rpm/packages/CVS/Root
-touch $RPM_BUILD_ROOT/home/services/builder/rpm/packages/CVS/Entries{,.Static}
-
 install -d $RPM_BUILD_ROOT/etc/poldek/repos.d
-cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/poldek/repos.d/%{name}.conf
+cp -p etc/poldek.conf $RPM_BUILD_ROOT/etc/poldek/repos.d/%{name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/rpm
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rpm/macros.builder
+cp -p etc/rpm.macros $RPM_BUILD_ROOT/etc/rpm/macros.builder
 
 # crontab
 install -d $RPM_BUILD_ROOT/etc/cron.d
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+cp -p etc/crontab $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
 # sudo
 install -d $RPM_BUILD_ROOT/etc/sudoers.d
-cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sudoers.d/%{name}
+cp -p etc/sudo $RPM_BUILD_ROOT/etc/sudoers.d/%{name}
 
-install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
+install -p etc/pld-builder.init $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
+cp -p etc/pld-builder.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
 
 # from admin/fresh-queue.sh
 cd $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
@@ -209,17 +222,20 @@ if [ "$1" = "0" ]; then
        %groupremove builder
 fi
 
+%post chroot
+%keep_packages pld-builder-chroot
+
 %postun chroot
 if [ "$1" = "0" ]; then
        %userremove builder
        %groupremove builder
+       %undo_keep_packages pld-builder-chroot
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc README TODO
-%doc user-manual.txt
-%lang(pl) %doc jak-to-dziala.txt jak-wysylac-zlecenia.txt
+%doc doc/{README,TODO,user-manual.txt}
+%lang(pl) %doc doc/{jak-to-dziala.txt,jak-wysylac-zlecenia.txt}
 
 %attr(754,root,root) /etc/rc.d/init.d/pld-builder
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pld-builder
@@ -270,11 +286,6 @@ fi
 
 # for srpm builder
 %attr(750,builder,builder) /home/services/builder/rpm/packages/builder
-%dir %attr(750,builder,builder) /home/services/builder/rpm/packages/CVS
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Repository
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Root
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Entries
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Entries.Static
 
 # minimal but sane defaults for rpm inside chroot
 %config(noreplace) %verify(not md5 mtime size) /etc/rpm/macros.builder