Update the spine spec file and move to the perl configball publisher. - Root config files in /etc/spine - Change from the slower python configball publisher to the perl one - s/spine-(fsball-publisher)/\1/g in the spec file Signed-off-by: Jeff Schroeder Index: Makefile =================================================================== --- Makefile (revision 259) +++ Makefile (working copy) @@ -19,12 +19,13 @@ DESTDIR ?= PREFIX ?= /usr -ETCDIR ?= /etc +ETCDIR ?= /etc/spine +INITDIR ?= /etc/init.d BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/lib/spine STATEDIR ?= /var/spine BALLDIR ?= $(STATEDIR)/configballs -SUBDIRS = $(ETCDIR) $(STATEDIR) $(BALLDIR) $(BINDIR) $(LIBDIR) +SUBDIRS = $(ETCDIR) $(INITDIR) $(STATEDIR) $(BALLDIR) $(BINDIR) $(LIBDIR) MKDIR ?= /bin/mkdir INSTALL ?= /usr/bin/install @@ -35,17 +36,22 @@ $(MKDIR) -p -m 0755 $(DESTDIR)$$dir; \ done -install_config: spine-config.conf scripts/cramfs-publisher.conf +install_config: spine-config.conf publisher/spine-publisher.conf.dist for I in $^; do \ - $(INSTALL) -m 0644 $$I $(DESTDIR)$(ETCDIR); \ + dest=`echo $$I | sed -e 's:publisher/::' -e 's:\.dist::'`; \ + $(INSTALL) -m 0644 $$I $(DESTDIR)$(ETCDIR)/$$dest; \ done -install_scripts: spine-config quick_template ui scripts/spine-cramfs-publish.py +install_scripts: spine-config quick_template ui publisher/spine-publisher for I in $^; do \ $(INSTALL) -m 0755 $$I $(DESTDIR)$(BINDIR); \ done +install_init: publisher/spine-publisher.init + dest=`echo $^ | sed -e 's:\.init::' -e 's:publisher/::'`; \ + $(INSTALL) -m 0755 $$I $^ $(DESTDIR)$(INITDIR)/$$dest; \ + install_lib: cd lib && \ for module in `find Spine -type f -name \*.pm \( ! -path '*/Data/*' -a ! -path '*/Action/*' \)`; do \ @@ -53,6 +59,6 @@ done \ && cd .. -install: mkdirs install_lib install_scripts install_config +install: mkdirs install_lib install_scripts install_config install_init -.PHONY : all install_lib install_scripts install_config +.PHONY : all install_lib install_scripts install_init install_config Index: spine.spec =================================================================== --- spine.spec (revision 259) +++ spine.spec (working copy) @@ -2,7 +2,7 @@ # vim:ts=8:noet %define spine_ver 2.0 -%define spine_rel rc22 +%define spine_rel rc23 %define spine_prefix /usr %define spine_lib_prefix %{spine_prefix}/lib/spine %define File_Temp_ver 0.16 @@ -38,13 +38,15 @@ Ticketmaster Configuration System %ifarch noarch -%package fsball-publisher +%package publisher Summary: Ticketmaster configuration system's publishing system Group: Ticketmaster BuildArch: noarch -Requires: python >= 2.2.3-5 +Requires: perl(SVN::Client) +Requires: perl(Config::Simple) +Obsoletes: spine-fsball-publisher -%description fsball-publisher +%description publisher Ticketmaster configuration system's publishing system %endif @@ -69,13 +71,8 @@ %attr(0755,root,root) %{spine_prefix}/bin/spine-config %attr(0755,root,root) %{spine_prefix}/bin/quick_template %dir %{spine_lib_prefix} -%dir %{spine_lib_prefix}/Spine -%dir %{spine_lib_prefix}/Spine/ConfigSource -%dir %{spine_lib_prefix}/Spine/Plugin -%{spine_lib_prefix}/Spine/*.pm -%{spine_lib_prefix}/Spine/ConfigSource/*.pm -%{spine_lib_prefix}/Spine/Plugin/*.pm -%config(noreplace) /etc/spine-config.conf +%{spine_lib_prefix}/Spine/* +%config(noreplace) %{_sysconfdir}/spine/*.conf # # This makes RPM 4.4 angry # @@ -83,16 +80,18 @@ %attr(0755,root,root) %{_localstatedir}/spine %ifarch noarch -%files fsball-publisher +%files publisher %defattr(-,root,root) -%{spine_prefix}/bin/spine-cramfs-publish.py -%{spine_prefix}/bin/spine-cramfs-publish.pyo -%{spine_prefix}/bin/spine-cramfs-publish.pyc -%config(noreplace) /etc/cramfs-publisher.conf - +%{spine_prefix}/bin/spine-publisher +%{_sysconfdir}/init.d/spine-publisher +%config(noreplace) %{_sysconfdir}/spine/spine-publisher.conf %endif %changelog +* Wed Nov 02 2009 Jeff Schroeder 2.0-rc23 +- Change to the faster pure perl configball publisher +- Update the spec file to not barf on Fedora + * Wed Oct 03 2007 Phil Dibowitz 2.0-rc22 - Add support for parsing lshw output - Add --action and --actiongroup support