From mboxrd@z Thu Jan 1 00:00:00 1970 From: kupcevic@sourceware.org Date: 6 Jul 2006 20:35:07 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/site/Makefile lu ... Message-ID: <20060706203507.2732.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: kupcevic at sourceware.org 2006-07-06 20:35:06 Modified files: . : conga.spec.in.in luci/site : Makefile luci/sysconfig : Makefile make : version.in Log message: Should be FC compliant RPM Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.14&r2=1.15 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/sysconfig/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.7&r2=1.8 --- conga/conga.spec.in.in 2006/07/05 22:08:16 1.14 +++ conga/conga.spec.in.in 2006/07/06 20:35:06 1.15 @@ -98,12 +98,9 @@ %config(noreplace) %{_sysconfdir}/rc.d/init.d/luci %config(noreplace) %{_sysconfdir}/sysconfig/luci %{_sbindir}/luci_admin -%attr(-,luci,root) %{_localstatedir}/lib/luci -%attr(600,luci,root)%config %{_localstatedir}/lib/luci/var/Data.fs -%config %{_localstatedir}/lib/luci/etc/zope.conf -%config(noreplace) %{_localstatedir}/lib/luci/etc/logrotate.conf -%config %{_localstatedir}/lib/luci/etc/stunnel.conf %{_docdir}/luci-%{version}/ +%defattr(-,luci,root) + %{_localstatedir}/lib/luci %pre -n luci /usr/sbin/groupadd -r -f luci >/dev/null 2>&1 @@ -431,6 +428,8 @@ %changelog +* Thu Jul 06 2006 Stanko Kupcevic 0.8-7 +- More compliant specfile, minor fixes * Tue Jun 27 2006 Stanko Kupcevic 0.8-6 - Luci persists users/clusters/systems/permissions across upgrades * Fri Jun 16 2006 Stanko Kupcevic 0.8-4 --- conga/luci/site/Makefile 2006/06/06 21:05:43 1.2 +++ conga/luci/site/Makefile 2006/07/06 20:35:06 1.3 @@ -8,28 +8,40 @@ install -d ${DESTDIR}/var install -d ${DESTDIR}/var/lib/ install -d ${DESTDIR}/var/lib/luci + install -d ${DESTDIR}/var/lib/luci/bin - install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin +# install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin + install luci/bin/runzope ${DESTDIR}/var/lib/luci/bin + install luci/bin/zopectl ${DESTDIR}/var/lib/luci/bin + install -d ${DESTDIR}/var/lib/luci/etc - install `find luci/etc -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/etc +# install `find luci/etc -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/etc + install -m 644 luci/etc/logrotate.conf ${DESTDIR}/var/lib/luci/etc + install -m 644 luci/etc/stunnel.conf ${DESTDIR}/var/lib/luci/etc + install -m 644 luci/etc/zope.conf ${DESTDIR}/var/lib/luci/etc + install -d ${DESTDIR}/var/lib/luci/Extensions - install `find luci/Extensions -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Extensions + install -m 644 `find luci/Extensions -maxdepth 1 -type f | grep .py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions + install -d ${DESTDIR}/var/lib/luci/import - install `find luci/import -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/import +# install -m 644 `find luci/import -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/import + install -d ${DESTDIR}/var/lib/luci/log - install `find luci/log -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/log +# install -m 644 `find luci/log -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/log + install -d ${DESTDIR}/var/lib/luci/Products - install `find luci/Products -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products +# install -m 644 `find luci/Products -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products install -d ${DESTDIR}/var/lib/luci/Products/ManagedSystem - install `find luci/Products/ManagedSystem -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products/ManagedSystem + install -m 644 `find luci/Products/ManagedSystem -maxdepth 1 -type f | grep .py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Products/ManagedSystem install -d ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins - install `find luci/Products/ManagedSystem/skins -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins + install -m 644 `find luci/Products/ManagedSystem/skins -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/Products/ManagedSystem/skins + install -d ${DESTDIR}/var/lib/luci/var - install `find luci/var -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/var + install -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var install -d ${DESTDIR}/var/lib/luci/var/pts - install `find luci/var/pts -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/var/pts +# install -m 644 `find luci/var/pts -maxdepth 1 -type f | grep .mo | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/var/pts install -d ${DESTDIR}/var/lib/luci/var/certs - install `find luci/var/certs -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/var/certs + install -m 644 luci/var/certs/cacert.config ${DESTDIR}/var/lib/luci/var/certs install -d ${DESTDIR}/var/lib/luci/var/stunnel --- conga/luci/sysconfig/Makefile 2006/06/16 23:14:34 1.1 +++ conga/luci/sysconfig/Makefile 2006/07/06 20:35:06 1.2 @@ -6,7 +6,7 @@ install: install -d ${DESTDIR}/etc/sysconfig - install luci ${DESTDIR}/etc/sysconfig + install -m 644 luci ${DESTDIR}/etc/sysconfig clean: --- conga/make/version.in 2006/06/27 21:15:31 1.7 +++ conga/make/version.in 2006/07/06 20:35:06 1.8 @@ -1,2 +1,2 @@ VERSION=0.8 -RELEASE=6 +RELEASE=7