Hello community, here is the log from the commit of package tgt for openSUSE:Factory checked in at 2013-07-21 08:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tgt (Old) and /work/SRC/openSUSE:Factory/.tgt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tgt" Changes: -------- --- /work/SRC/openSUSE:Factory/tgt/tgt.changes 2013-04-14 13:00:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tgt.new/tgt.changes 2013-07-21 08:12:47.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 13 14:25:21 UTC 2013 - [email protected] + +- add setup-tgt-conf-d.patch: Configure a /etc/tgt/conf.d by default +- move examples to docdir + +------------------------------------------------------------------- New: ---- setup-tgt-conf-d.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tgt.spec ++++++ --- /var/tmp/diff_new_pack.u9UrBe/_old 2013-07-21 08:12:48.000000000 +0200 +++ /var/tmp/diff_new_pack.u9UrBe/_new 2013-07-21 08:12:48.000000000 +0200 @@ -38,6 +38,7 @@ Patch2: %{name}-fix-build # PATCH-FIX-UPSTREAM tgt-mgmt-fixed-m-system-o-delete-handling.patch [bnc#767438] - [email protected] Patch3: %{name}-mgmt-fixed-m-system-o-delete-handling.patch +Patch4: setup-tgt-conf-d.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,6 +61,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %build %ifarch ppc ppc64 @@ -93,9 +95,8 @@ /usr/sbin/* /etc/init.d/tgtd %dir /etc/tgt -%dir /etc/tgt/examples +%dir /etc/tgt/conf.d %config %attr(0644,root,root) /etc/tgt/targets.conf -%config %attr(0644,root,root) /etc/tgt/examples/* %config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/tgt %doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration %doc doc/README.mmc doc/README.passthrough doc/README.sbcjukebox doc/README.ssc ++++++ setup-tgt-conf-d.patch ++++++ --- conf/Makefile +++ conf/Makefile @@ -1,4 +1,5 @@ sysconfdir ?= /etc +docdatadir ?= /usr/share/doc/packages/ EXAMPLES = targets.conf.example targets.conf.vtl.L700 targets.conf.vtl.MSL2024 @@ -11,9 +12,10 @@ if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \ install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \ fi - install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/examples + install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/conf.d + install -d -m 755 $(DESTDIR)$(docdatadir)/tgt/examples for f in $(EXAMPLES) ; do \ - install -m 644 examples/$$f $(DESTDIR)$(sysconfdir)/tgt/examples ;\ + install -m 644 examples/$$f $(DESTDIR)$(docdatadir)/tgt/examples ;\ done .PHONY: clean --- conf/targets.conf +++ conf/targets.conf @@ -1,2 +1,7 @@ # Empty targets configuration file -- please see the package # documentation directory for an example. + +# +# Include configuration from directory +# +include /etc/tgt/conf.d/*.conf -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
