commit puppet for openSUSE:11.4:Update
Hello community, here is the log from the commit of package puppet for openSUSE:11.4:Update checked in at 2012-07-19 17:04:24 Comparing /work/SRC/openSUSE:11.4:Update/puppet (Old) and /work/SRC/openSUSE:11.4:Update/.puppet.new (New) Package is puppet, Maintainer is vdziewie...@suse.com Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.AZEUom/_old 2012-07-19 17:04:25.0 +0200 +++ /var/tmp/diff_new_pack.AZEUom/_new 2012-07-19 17:04:25.0 +0200 @@ -1 +1 @@ -link package='puppet.579' cicount='copy' / +link package='puppet.618' cicount='copy' / -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit puppet for openSUSE:12.1:Update
Hello community, here is the log from the commit of package puppet for openSUSE:12.1:Update checked in at 2012-07-19 17:04:22 Comparing /work/SRC/openSUSE:12.1:Update/puppet (Old) and /work/SRC/openSUSE:12.1:Update/.puppet.new (New) Package is puppet, Maintainer is vdziewie...@suse.com Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.mBuZ7j/_old 2012-07-19 17:04:24.0 +0200 +++ /var/tmp/diff_new_pack.mBuZ7j/_new 2012-07-19 17:04:24.0 +0200 @@ -1 +1 @@ -link package='puppet.459' cicount='copy' / +link package='puppet.618' cicount='copy' / -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit texinfo for openSUSE:Factory
Hello community,
here is the log from the commit of package texinfo for openSUSE:Factory checked
in at 2012-07-19 17:45:54
Comparing /work/SRC/openSUSE:Factory/texinfo (Old)
and /work/SRC/openSUSE:Factory/.texinfo.new (New)
Package is texinfo, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/texinfo/texinfo.changes 2012-07-12
10:53:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.texinfo.new/texinfo.changes 2012-07-19
17:45:56.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul 17 16:11:16 UTC 2012 - wer...@suse.de
+
+- Split off makeinfo as separate package to independed from
+ TeXLive
+
+---
Other differences:
--
++ texinfo.spec ++
--- /var/tmp/diff_new_pack.ZT5wBm/_old 2012-07-19 17:45:58.0 +0200
+++ /var/tmp/diff_new_pack.ZT5wBm/_new 2012-07-19 17:45:58.0 +0200
@@ -33,11 +33,11 @@
Group: Productivity/Publishing/Texinfo
Url:http://www.texinfo.org
PreReq: %{install_info_prereq}
-Provides: makeinfo = %{version}
Provides: texi2html = %{version_t2h}
Provides: texi2roff = %{version_t2r}
%if %suse_version 1220
Requires: latex2html
+Requires: makeinfo
Requires: texlive-bibtex
Requires: texlive-latex
Requires: texlive-makeindex
@@ -93,7 +93,7 @@
%package -n info
Summary:A Stand-Alone Terminal-Based Info Browser
-License:GPL-2.0+
+License:GPL-3.0+
Group: Productivity/Publishing/Texinfo
PreReq: bash zlib libzio
@@ -121,6 +121,18 @@
Robert J. Chassell b...@gnu.org
Roland McGrath rol...@gnu.org
+%package -n makeinfo
+Summary:Translate Texinfo documents to info format
+License:GPL-3.0+
+Group: Productivity/Publishing/Texinfo
+Provides: texinfo:/usr/bin/makeinfo
+Suggests: texinfo
+
+%description -n makeinfo
+Makeinfo translates Texinfo source documentation to various other
+formats, by default Info files suitable for reading online with Emacs
+or standalone GNU Info.
+
%prep
rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r}
%setup -q -b 1 -b 2 -n texinfo-4.13
@@ -220,7 +232,7 @@
%install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/info.info.gz
-%files -f %{name}.lang
+%files
%defattr(-, root, root)
%dir %{_defaultdocdir}/texi2html
%dir %{_defaultdocdir}/texi2roff
@@ -228,18 +240,21 @@
%doc doc/texinfo.tex doc/txi-*.tex
%doc %{_defaultdocdir}/texi2html/*
%doc %{_defaultdocdir}/texi2roff/*
-%{_bindir}/makeinfo
%{_bindir}/pdftexi*
%{_bindir}/texi*
%{_infodir}/texinfo*.gz
%{_infodir}/texi2html*.gz
-%{_mandir}/man1/makeinfo.1.gz
%{_mandir}/man1/pdftexi2dvi.1.gz
%{_mandir}/man1/texi*.1.gz
%{_mandir}/man5/texinfo.5.gz
%{_datadir}/texinfo
%{_datadir}/texi2html
+%files -n makeinfo -f %{name}.lang
+%defattr(-,root,root)
+%{_bindir}/makeinfo
+%{_mandir}/man1/makeinfo.1.gz
+
%files -n info
%defattr(-,root,root)
%config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir
++ texi2roff-2.0-gcc4.patch ++
--- /var/tmp/diff_new_pack.ZT5wBm/_old 2012-07-19 17:45:58.0 +0200
+++ /var/tmp/diff_new_pack.ZT5wBm/_new 2012-07-19 17:45:58.0 +0200
@@ -1,6 +1,5 @@
-diff -ru texi2roff-2.0/table.c texi2roff-2.0.new/table.c
texi2roff-2.0/table.c 1992-02-20 18:16:37.0 +
-+++ texi2roff-2.0.new/table.c 2005-03-18 17:59:54.0 +
+--- texi2roff-2.0/table.c
texi2roff-2.0/table.c 2005-03-18 17:59:54.0 +
@@ -32,13 +32,14 @@
struct misccmds * cmds;
struct tablerecd * table, * endoftable;
@@ -17,3 +16,13 @@
int tablesize;
switch (macropkg) {
+--- texi2roff-2.0/texi2roff.c
texi2roff-2.0/texi2roff.c 2012-07-17 16:09:22.852010105 +
+@@ -13,6 +13,7 @@
+ #include sys/types.h
+ #endif
+ #include sys/stat.h
++#include unistd.h
+ #include texi2roff.h
+
+ #if !defined(S_ISDIR) defined(S_IFDIR)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit accountsservice for openSUSE:Factory
Hello community, here is the log from the commit of package accountsservice for openSUSE:Factory checked in at 2012-07-19 17:56:34 Comparing /work/SRC/openSUSE:Factory/accountsservice (Old) and /work/SRC/openSUSE:Factory/.accountsservice.new (New) Package is accountsservice, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/accountsservice/accountsservice.changes 2012-07-02 10:46:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.accountsservice.new/accountsservice.changes 2012-07-19 17:56:35.0 +0200 @@ -1,0 +2,5 @@ +Wed Jul 18 18:14:47 UTC 2012 - dims...@opensuse.org + +- Add the user 'fax' to the exception list (bnc#771177). + +--- Other differences: -- ++ accountsservice-filter-suse-accounts.patch ++ --- /var/tmp/diff_new_pack.akGa4c/_old 2012-07-19 17:56:38.0 +0200 +++ /var/tmp/diff_new_pack.akGa4c/_new 2012-07-19 17:56:38.0 +0200 @@ -2,11 +2,12 @@ === --- accountsservice-0.6.21.orig/src/daemon.c +++ accountsservice-0.6.21/src/daemon.c -@@ -80,6 +80,11 @@ static const char *default_excludes[] = +@@ -80,6 +80,12 @@ static const char *default_excludes[] = games, man, at, +beagleindex, ++fax, +suse-ncc, +mailman, +ldap, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit accountsservice for openSUSE:12.2
Hello community, here is the log from the commit of package accountsservice for openSUSE:12.2 checked in at 2012-07-19 17:56:39 Comparing /work/SRC/openSUSE:12.2/accountsservice (Old) and /work/SRC/openSUSE:12.2/.accountsservice.new (New) Package is accountsservice, Maintainer is Changes: --- /work/SRC/openSUSE:12.2/accountsservice/accountsservice.changes 2012-06-28 15:15:15.0 +0200 +++ /work/SRC/openSUSE:12.2/.accountsservice.new/accountsservice.changes 2012-07-19 17:56:40.0 +0200 @@ -1,0 +2,21 @@ +Wed Jul 18 18:14:47 UTC 2012 - dims...@opensuse.org + +- Add the user 'fax' to the exception list (bnc#771177). + +--- +Thu Jun 28 20:14:58 UTC 2012 - dims...@opensuse.org + +- Update to version 0.6.22: + + Correct CVE-2012-2737, local file disclosure + + small memory leak fix + + exclude system accounts from ListCachedUsers + + make has-multiple-users properly only check non-system users + + remove icon when deleting user + + Revert usage of getpwent() as fallback for fgetpwent + + support consolekit call cancellation to prevent crashes caused +by shortlived sessions + + ignore built files in .gitignore + + quiet down build goo nagging +- Drop accountsservice-CVE-2012-2737.patch: fixed upstream. + +--- Old: accountsservice-0.6.21.tar.xz accountsservice-CVE-2012-2737.patch New: accountsservice-0.6.22.tar.xz Other differences: -- ++ accountsservice.spec ++ --- /var/tmp/diff_new_pack.2GaWiF/_old 2012-07-19 17:56:41.0 +0200 +++ /var/tmp/diff_new_pack.2GaWiF/_new 2012-07-19 17:56:41.0 +0200 @@ -17,7 +17,7 @@ Name: accountsservice -Version:0.6.21 +Version:0.6.22 Release:0 Summary:D-Bus Service to Manipulate User Account Information License:GPL-3.0+ @@ -29,8 +29,6 @@ Patch0: accountsservice-sysconfig.patch # PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vu...@opensuse.org -- Filter out some system users that are specific to openSUSE Patch1: accountsservice-filter-suse-accounts.patch -# PATCH-FIX-UPSTREAM accountsservice-CVE-2012-2737.patch bnc#768807 CVE-2012-2737 vu...@opensuse.org -- Fix local file disclosure flaw -Patch2: accountsservice-CVE-2012-2737.patch # needed for patch0 BuildRequires: gnome-common BuildRequires: gobject-introspection-devel @@ -91,7 +89,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build # needed for patch0 ++ accountsservice-filter-suse-accounts.patch ++ --- /var/tmp/diff_new_pack.2GaWiF/_old 2012-07-19 17:56:41.0 +0200 +++ /var/tmp/diff_new_pack.2GaWiF/_new 2012-07-19 17:56:41.0 +0200 @@ -2,11 +2,12 @@ === --- accountsservice-0.6.21.orig/src/daemon.c +++ accountsservice-0.6.21/src/daemon.c -@@ -80,6 +80,11 @@ static const char *default_excludes[] = +@@ -80,6 +80,12 @@ static const char *default_excludes[] = games, man, at, +beagleindex, ++fax, +suse-ncc, +mailman, +ldap, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-daemon for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-daemon for
openSUSE:Factory checked in at 2012-07-19 17:57:00
Comparing /work/SRC/openSUSE:Factory/apache-commons-daemon (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-daemon.new (New)
Package is apache-commons-daemon, Maintainer is
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-daemon/apache-commons-daemon.changes
2012-07-03 20:25:02.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-daemon.new/apache-commons-daemon.changes
2012-07-19 17:57:01.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 19 09:13:08 UTC 2012 - mvysko...@suse.cz
+
+- fix bnc#771802: jsvc fails to load libcap
+
+---
New:
jsvc-libcap-relative.patch
Other differences:
--
++ apache-commons-daemon.spec ++
--- /var/tmp/diff_new_pack.cna1O6/_old 2012-07-19 17:57:04.0 +0200
+++ /var/tmp/diff_new_pack.cna1O6/_new 2012-07-19 17:57:04.0 +0200
@@ -30,6 +30,7 @@
Patch1: apache-commons-daemon-JAVA_OS.patch
Patch2: apache-commons-daemon-s390x.patch
Patch3: apache-commons-daemon-ppc64.patch
+Patch4: jsvc-libcap-relative.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
@@ -79,6 +80,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# remove java binaries from sources
rm -rf src/samples/build/
++ jsvc-libcap-relative.patch ++
Index: commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c
===
--- commons-daemon-1.0.10-src.orig/src/native/unix/native/jsvc-unix.c
2012-07-18 16:00:46.791533454 +0200
+++ commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c
2012-07-18 16:02:14.303529317 +0200
@@ -247,12 +247,9 @@
static fd_cap_set_proc fp_cap_set_proc;
static const char *libcap_locs[] = {
-/lib/libcap.so.2,
-/lib/libcap.so.1,
-/lib/libcap.so,
-/usr/lib/libcap.so.2,
-/usr/lib/libcap.so.1,
-/usr/lib/libcap.so,
+libcap.so.2,
+libcap.so.1,
+libcap.so,
NULL
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-daemon for openSUSE:12.2
Hello community,
here is the log from the commit of package apache-commons-daemon for
openSUSE:12.2 checked in at 2012-07-19 17:57:05
Comparing /work/SRC/openSUSE:12.2/apache-commons-daemon (Old)
and /work/SRC/openSUSE:12.2/.apache-commons-daemon.new (New)
Package is apache-commons-daemon, Maintainer is
Changes:
--- /work/SRC/openSUSE:12.2/apache-commons-daemon/apache-commons-daemon.changes
2012-07-03 20:25:07.0 +0200
+++
/work/SRC/openSUSE:12.2/.apache-commons-daemon.new/apache-commons-daemon.changes
2012-07-19 17:57:06.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 19 09:13:08 UTC 2012 - mvysko...@suse.cz
+
+- fix bnc#771802: jsvc fails to load libcap
+
+---
New:
jsvc-libcap-relative.patch
Other differences:
--
++ apache-commons-daemon.spec ++
--- /var/tmp/diff_new_pack.vOLuGc/_old 2012-07-19 17:57:06.0 +0200
+++ /var/tmp/diff_new_pack.vOLuGc/_new 2012-07-19 17:57:06.0 +0200
@@ -30,6 +30,7 @@
Patch1: apache-commons-daemon-JAVA_OS.patch
Patch2: apache-commons-daemon-s390x.patch
Patch3: apache-commons-daemon-ppc64.patch
+Patch4: jsvc-libcap-relative.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
@@ -79,6 +80,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# remove java binaries from sources
rm -rf src/samples/build/
++ jsvc-libcap-relative.patch ++
Index: commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c
===
--- commons-daemon-1.0.10-src.orig/src/native/unix/native/jsvc-unix.c
2012-07-18 16:00:46.791533454 +0200
+++ commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c
2012-07-18 16:02:14.303529317 +0200
@@ -247,12 +247,9 @@
static fd_cap_set_proc fp_cap_set_proc;
static const char *libcap_locs[] = {
-/lib/libcap.so.2,
-/lib/libcap.so.1,
-/lib/libcap.so,
-/usr/lib/libcap.so.2,
-/usr/lib/libcap.so.1,
-/usr/lib/libcap.so,
+libcap.so.2,
+libcap.so.1,
+libcap.so,
NULL
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gnome-screensaver for openSUSE:Factory
Hello community, here is the log from the commit of package gnome-screensaver for openSUSE:Factory checked in at 2012-07-19 17:57:18 Comparing /work/SRC/openSUSE:Factory/gnome-screensaver (Old) and /work/SRC/openSUSE:Factory/.gnome-screensaver.new (New) Package is gnome-screensaver, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/gnome-screensaver/gnome-screensaver.changes 2012-07-18 17:15:45.0 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-screensaver.new/gnome-screensaver.changes 2012-07-19 17:57:22.0 +0200 @@ -1,0 +2,9 @@ +Tue Jul 17 20:29:28 UTC 2012 - dims...@opensuse.org + +- Update to version 3.4.4: + + Revert reversion from 3.4.3: It wasn't causing problems for +users. + + Revert background color setting patch. It is causing problems +for users. + +--- Old: gnome-screensaver-3.4.3.tar.xz New: gnome-screensaver-3.4.4.tar.xz Other differences: -- ++ gnome-screensaver.spec ++ --- /var/tmp/diff_new_pack.bgM7oq/_old 2012-07-19 17:57:27.0 +0200 +++ /var/tmp/diff_new_pack.bgM7oq/_new 2012-07-19 17:57:27.0 +0200 @@ -17,7 +17,7 @@ Name: gnome-screensaver -Version:3.4.3 +Version:3.4.4 Release:0 Url:http://www.gnome.org/ Summary:GNOME Screen Saver and Locker -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gnome-tweak-tool for openSUSE:Factory
Hello community,
here is the log from the commit of package gnome-tweak-tool for
openSUSE:Factory checked in at 2012-07-19 17:57:46
Comparing /work/SRC/openSUSE:Factory/gnome-tweak-tool (Old)
and /work/SRC/openSUSE:Factory/.gnome-tweak-tool.new (New)
Package is gnome-tweak-tool, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/gnome-tweak-tool/gnome-tweak-tool.changes
2012-05-22 08:15:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-tweak-tool.new/gnome-tweak-tool.changes
2012-07-19 17:58:17.0 +0200
@@ -1,0 +2,9 @@
+Wed Jul 18 19:12:57 UTC 2012 - dims...@opensuse.org
+
+- Add gnome-tweak-tool-pwr-button.patch: Allow to configure what
+ action should be performed when pressing the power button (acpi)
+ (bnc#770048).
+- Drop xz BuildRequires as it now comes for free in the build
+ system.
+
+---
New:
gnome-tweak-tool-pwr-button.patch
Other differences:
--
++ gnome-tweak-tool.spec ++
--- /var/tmp/diff_new_pack.prUNJs/_old 2012-07-19 17:58:25.0 +0200
+++ /var/tmp/diff_new_pack.prUNJs/_new 2012-07-19 17:58:25.0 +0200
@@ -17,7 +17,6 @@
#
-
Name: gnome-tweak-tool
Version:3.4.0.1
Release:0
@@ -26,13 +25,13 @@
Group: System/GUI/GNOME
Url:http://live.gnome.org/GnomeTweakTool
Source0:
http://download.gnome.org/sources/gnome-tweak-tool/3.4/%{name}-%{version}.tar.xz
+# PATCH-FEATURE-UPSTREAM gnome-tweak-tool-pwr-button.patch bnc#770048
dims...@opensuse.org -- Add option to specify action to perform on power button
press
+Patch0: gnome-tweak-tool-pwr-button.patch
BuildRequires: fdupes
# Needed to have typelib() Requires
BuildRequires: gobject-introspection
BuildRequires: intltool
BuildRequires: update-desktop-files
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
-BuildRequires: xz
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) = 3.4.0
BuildRequires: pkgconfig(pygobject-3.0) = 3.2.1
@@ -50,6 +49,7 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
%build
%configure
++ gnome-tweak-tool-pwr-button.patch ++
diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py
index 5bb664f..da7bf8d 100644
--- a/gtweak/tweaks/tweak_shell.py
+++ b/gtweak/tweaks/tweak_shell.py
@@ -235,6 +235,7 @@ TWEAK_GROUPS = (
ShowWindowButtons(schema_filename=org.gnome.shell.gschema.xml,
size_group=sg),
GSettingsComboEnumTweak(org.gnome.settings-daemon.plugins.power,
lid-close-battery-action, size_group=sg),
GSettingsComboEnumTweak(org.gnome.settings-daemon.plugins.power,
lid-close-ac-action, size_group=sg),
+GSettingsComboEnumTweak(org.gnome.settings-daemon.plugins.power,
button-power, size_group=sg),
GSettingsSwitchTweak(org.gnome.shell.overrides,
workspaces-only-on-primary),
StaticWorkspaceTweak(size_group=sg)),
)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mkinitrd for openSUSE:Factory
Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at 2012-07-19 17:58:16
Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
and /work/SRC/openSUSE:Factory/.mkinitrd.new (New)
Package is mkinitrd, Maintainer is mma...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-07-04
22:21:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-07-19
17:58:35.0 +0200
@@ -1,0 +2,5 @@
+Wed Jul 18 14:23:18 UTC 2012 - mma...@suse.cz
+
+- Add xhci-hcd to the initrd (bnc#755113).
+
+---
@@ -22,0 +28,11 @@
+
+---
+Fri May 11 11:04:06 UTC 2012 - mma...@suse.cz
+
+- setup-network.sh: Fix handling of bridge interfaces (bnc#759623)
+
+---
+Fri May 4 13:57:48 UTC 2012 - mma...@suse.cz
+
+- Recreate the initrd for all installed kernels after updating
+ the mkinitrd package (bnc#755924).
Old:
mkinitrd-2.7.0-adjtime.patch
Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.p8bnU3/_old 2012-07-19 17:58:40.0 +0200
+++ /var/tmp/diff_new_pack.p8bnU3/_new 2012-07-19 17:58:40.0 +0200
@@ -47,7 +47,6 @@
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:mkinitrd.tar.bz2
-Patch0: mkinitrd-2.7.0-adjtime.patch
# Note: the whole package is maintained in this git repository, please
# don't change it in the build service without sending the author a
# pull request or patch first. Otherwise, you risk that your changes will be
@@ -82,7 +81,6 @@
%prep
%setup
-%patch0 -p1
%build
%__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
@@ -136,6 +134,7 @@
%posttrans
/sbin/mkinitrd_setup
+/sbin/mkinitrd
%files
%defattr(-,root,root)
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-06-13 15:58:10.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-07-18 16:26:28.0 +0200
@@ -1,4 +1,16 @@
---
+Wed Jul 18 14:23:18 UTC 2012 - mma...@suse.cz
+
+- Add xhci-hcd to the initrd (bnc#755113).
+
+---
+Wed Jul 4 14:43:05 UTC 2012 - wer...@suse.de
+
+- Fix boot clock scriptlet by testing /etc/adjtime before
+ /etc/sysconfig/clock to make sure that warpclock is executed
+ if CMOS clock is in local time
+
+---
Tue Jun 12 15:28:45 UTC 2012 - co...@suse.com
- mount /usr without chrooting into root fs first, /usr carries
@@ -15,6 +27,17 @@
- Make warpclock working with upstream systemd HW clock management
---
+Fri May 11 11:04:06 UTC 2012 - mma...@suse.cz
+
+- setup-network.sh: Fix handling of bridge interfaces (bnc#759623)
+
+---
+Fri May 4 13:57:48 UTC 2012 - mma...@suse.cz
+
+- Recreate the initrd for all installed kernels after updating
+ the mkinitrd package (bnc#755924).
+
+---
Thu May 3 11:59:35 UTC 2012 - mma...@suse.cz
- Avoid accidental tilde expansion when parsing parameters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec2012-06-13 15:58:10.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.spec2012-07-18 16:26:28.0 +0200
@@ -126,6 +126,7 @@
%posttrans
/sbin/mkinitrd_setup
+/sbin/mkinitrd
%files
%defattr(-,root,root)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-clock.sh
new/mkinitrd-2.7.0/scripts/boot-clock.sh
--- old/mkinitrd-2.7.0/scripts/boot-clock.sh2012-06-13 15:58:10.0
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-clock.sh2012-07-18 16:26:28.0
+0200
@@ -5,21 +5,23 @@
#%provides: clock
#%dontshow
-if test -e /etc/sysconfig/clock -a -e /etc/localtime
+if test -e /etc/localtime
then
-. /etc/sysconfig/clock
-case $HWCLOCK in
-*-l*) /bin/warpclock
- /dev/shm/warpclock
-esac
-elif test -e /etc/adjtime -a -e /etc/localtime
-then
-while read line
-do
-
commit pbuilder for openSUSE:Factory
Hello community,
here is the log from the commit of package pbuilder for openSUSE:Factory
checked in at 2012-07-19 17:58:39
Comparing /work/SRC/openSUSE:Factory/pbuilder (Old)
and /work/SRC/openSUSE:Factory/.pbuilder.new (New)
Package is pbuilder, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/pbuilder/pbuilder.changes2012-06-01
07:22:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.pbuilder.new/pbuilder.changes 2012-07-19
17:58:40.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 19 06:49:31 UTC 2012 - dval...@suse.com
+
+- fix testsuite to run on ppc64
+- add man to BuildRequires, testsuite requires it
+
+---
New:
pbuilder-ppc.patch
Other differences:
--
++ pbuilder.spec ++
--- /var/tmp/diff_new_pack.aW3MQa/_old 2012-07-19 17:58:49.0 +0200
+++ /var/tmp/diff_new_pack.aW3MQa/_new 2012-07-19 17:58:49.0 +0200
@@ -31,6 +31,7 @@
Patch3: bash-completion-have.patch
Patch4: bash-completion-extglob.patch
Patch5: test-suite.patch
+Patch6: pbuilder-ppc.patch
Requires: debootstrap
Requires: dpkg
Requires: wget
@@ -38,6 +39,7 @@
Recommends: deb fakeroot sudo
%endif
BuildRequires: dpkg
+BuildRequires: man
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,6 +71,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%{__make} %{?jobs:-j%jobs}
++ pbuilder-ppc.patch ++
Index: pbuilder-0.211/pbuilder-apt-config
===
--- pbuilder-0.211.orig/pbuilder-apt-config
+++ pbuilder-0.211/pbuilder-apt-config
@@ -67,7 +67,7 @@ guess_dist_arch_archive() {
amd64|i386)
echo ubuntu
;;
- armel|armhf|hppa|ia64|lpia|powerpc|sparc)
+ armel|armhf|hppa|ia64|lpia|powerpc|sparc|ppc|ppc64)
echo ubuntu-ports
;;
*)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit perl-Prima for openSUSE:12.2
Hello community,
here is the log from the commit of package perl-Prima for openSUSE:12.2 checked
in at 2012-07-19 17:59:05
Comparing /work/SRC/openSUSE:12.2/perl-Prima (Old)
and /work/SRC/openSUSE:12.2/.perl-Prima.new (New)
Package is perl-Prima, Maintainer is j...@suse.com
Changes:
--- /work/SRC/openSUSE:12.2/perl-Prima/perl-Prima.changes 2012-06-25
15:49:24.0 +0200
+++ /work/SRC/openSUSE:12.2/.perl-Prima.new/perl-Prima.changes 2012-07-19
17:59:09.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 19 06:59:44 UTC 2012 - co...@suse.com
+
+- the license is actually BSD-2-Clause, as confirmed by the author,
+ next version will have it fixed in the documentation (bnc#688800)
+ (https://github.com/dk/Prima/commit/43a3fb04d9915f7f3c3cd71feb5ff247eccd04df)
+
+---
Other differences:
--
++ perl-Prima.spec ++
--- /var/tmp/diff_new_pack.8puLz7/_old 2012-07-19 17:59:09.0 +0200
+++ /var/tmp/diff_new_pack.8puLz7/_new 2012-07-19 17:59:09.0 +0200
@@ -30,7 +30,7 @@
Version:1.34
Release:0
Summary:A Perl toolkit for multi-platform GUI development
-License:BSD-3-Clause
+License:BSD-2-Clause
Group: Development/Libraries/Perl
Url:http://prima.eu.org
Source:
http://www.cpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit perl-Prima for openSUSE:Factory
Hello community,
here is the log from the commit of package perl-Prima for openSUSE:Factory
checked in at 2012-07-19 17:59:00
Comparing /work/SRC/openSUSE:Factory/perl-Prima (Old)
and /work/SRC/openSUSE:Factory/.perl-Prima.new (New)
Package is perl-Prima, Maintainer is j...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/perl-Prima/perl-Prima.changes2012-06-06
10:29:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Prima.new/perl-Prima.changes
2012-07-19 17:59:05.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 19 06:59:44 UTC 2012 - co...@suse.com
+
+- the license is actually BSD-2-Clause, as confirmed by the author,
+ next version will have it fixed in the documentation (bnc#688800)
+ (https://github.com/dk/Prima/commit/43a3fb04d9915f7f3c3cd71feb5ff247eccd04df)
+
+---
Other differences:
--
++ perl-Prima.spec ++
--- /var/tmp/diff_new_pack.kK2tXW/_old 2012-07-19 17:59:09.0 +0200
+++ /var/tmp/diff_new_pack.kK2tXW/_new 2012-07-19 17:59:09.0 +0200
@@ -30,7 +30,7 @@
Version:1.34
Release:0
Summary:A Perl toolkit for multi-platform GUI development
-License:BSD-3-Clause
+License:BSD-2-Clause
Group: Development/Libraries/Perl
Url:http://prima.eu.org
Source:
http://www.cpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit postfix for openSUSE:Factory
Hello community,
here is the log from the commit of package postfix for openSUSE:Factory checked
in at 2012-07-19 17:59:15
Comparing /work/SRC/openSUSE:Factory/postfix (Old)
and /work/SRC/openSUSE:Factory/.postfix.new (New)
Package is postfix, Maintainer is vark...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2012-06-13
12:42:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-07-19
17:59:16.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 19 06:52:18 UTC 2012 - vark...@suse.com
+
+- bnc#771811 - postfix update does not regenerate the maps
+
+---
Other differences:
--
++ postfix.spec ++
--- /var/tmp/diff_new_pack.5cG0Ft/_old 2012-07-19 17:59:20.0 +0200
+++ /var/tmp/diff_new_pack.5cG0Ft/_new 2012-07-19 17:59:20.0 +0200
@@ -302,7 +302,7 @@
mkdir -p %{buildroot}/etc/postfix/system
install -m 0644 %{name}-SuSE/postfix.service
%{buildroot}/lib/systemd/system/
install -m 0755 %{name}-SuSE/update_chroot.systemd
%{buildroot}/etc/postfix/system/update_chroot
-install -m 0755 %{name}-SuSE/rebuild_tables.systemd
%{buildroot}/etc/postfix/system/rebuild_tables
+install -m 0755 %{name}-SuSE/update_postmaps.systemd
%{buildroot}/etc/postfix/system/update_postmaps
install -m 0755 %{name}-SuSE/wait_qmgr.systemd
%{buildroot}/etc/postfix/system/wait_qmgr
install -m 0755 %{name}-SuSE/cond_slp.systemd
%{buildroot}/etc/postfix/system/cond_slp
%endif
@@ -482,7 +482,7 @@
%if 0%{?suse_version} = 1140
%dir /etc/postfix/system
%config %attr(0755,root,root) /etc/postfix/system/update_chroot
-%config %attr(0755,root,root) /etc/postfix/system/rebuild_tables
+%config %attr(0755,root,root) /etc/postfix/system/update_postmaps
%config %attr(0755,root,root) /etc/postfix/system/wait_qmgr
%config %attr(0755,root,root) /etc/postfix/system/cond_slp
%config /lib/systemd/system/postfix.service
++ postfix-SuSE.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/postfix.service
new/postfix-SuSE/postfix.service
--- old/postfix-SuSE/postfix.service2012-01-17 12:14:10.0 +0100
+++ new/postfix-SuSE/postfix.service2012-07-19 08:46:19.0 +0200
@@ -26,6 +26,7 @@
ExecStartPre=-/bin/echo 'Starting mail service (Postfix)'
EnvironmentFile=-/etc/sysconfig/postfix
ExecStartPre=/etc/postfix/system/update_chroot
+ExecStartPre=/etc/postfix/system/update_postmaps
ExecStart=/usr/sbin/postfix start
ExecStartPost=/etc/postfix/system/wait_qmgr 60
ExecStartPost=/etc/postfix/system/cond_slp register
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/rc.postfix new/postfix-SuSE/rc.postfix
--- old/postfix-SuSE/rc.postfix 2012-03-07 07:29:40.0 +0100
+++ new/postfix-SuSE/rc.postfix 2012-07-19 08:48:49.0 +0200
@@ -107,29 +107,6 @@
return $RET
}
-update_postmaps() {
-test -f /etc/sysconfig/postfix . /etc/sysconfig/postfix
-
-if [ -n ${POSTFIX_UPDATE_MAPS/[yY][Ee][Ss]/} ]; then
-return
-fi
-# Update the postmaps
-for i in $POSTFIX_MAP_LIST; do
-m=/etc/postfix/$i;
-d=$m.db
-if [ -e $m -a $m -nt $d ]; then
-postmap $m;
-fi
-done
-for i in /etc/aliases /etc/aliases.d/*; do
-m=${i/.db//}
- d=$m.db
-if [ -e $m -a $m -nt $d ]; then
-postalias $m;
-fi
-done
-}
-
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_statuscheck and set local and overall rc status
@@ -221,7 +198,7 @@
## the echo return value is set appropriate.
if ! checkproc -p $PIDFILE $MASTER_BIN; then
- update_postmaps
+ /etc/postfix/system/update_postmaps
$POSTFIX_BIN start /dev/null 21
else
rc_reset
@@ -270,6 +247,7 @@
echo -n Reload mail service (Postfix)
+ /etc/postfix/system/update_postmaps
$POSTFIX_BIN reload /dev/null 21
rc_status -v
POSTFIX_BIN flush /dev/null 21
@@ -281,6 +259,7 @@
reload)
echo -n Reload mail service (Postfix)
+ /etc/postfix/system/update_postmaps
$POSTFIX_BIN reload /dev/null 21
rc_status -v
$POSTFIX_BIN flush /dev/null 21
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/postfix-SuSE/rebuild_tables.systemd
new/postfix-SuSE/rebuild_tables.systemd
---
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-07-19 17:59:29
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-07-09 13:31:11.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-07-19
17:59:31.0 +0200
@@ -1,0 +2,10 @@
+Thu Jul 19 08:52:02 UTC 2012 - co...@suse.com
+
+- add tar to the rpm build essentials
+
+---
+Wed Jul 18 15:52:25 UTC 2012 - co...@suse.com
+
+- add an -r option to %lang_package (bnc#513786)
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.gGIvR2/_old 2012-07-19 17:59:36.0 +0200
+++ /var/tmp/diff_new_pack.gGIvR2/_new 2012-07-19 17:59:36.0 +0200
@@ -190,6 +190,7 @@
Requires: make
Requires: patch
Requires: perl-base
+Requires: tar
Requires: xz
%description build
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.gGIvR2/_old 2012-07-19 17:59:36.0 +0200
+++ /var/tmp/diff_new_pack.gGIvR2/_new 2012-07-19 17:59:36.0 +0200
@@ -320,11 +320,12 @@
%nil
# Template for lang sub-package.
-%lang_package(n:) \
+%lang_package(n:r:) \
%package %{-n:-n %{-n*}-}lang \
Summary: Languages for package %{name} \
Group: System/Localization \
Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
+%{-r:Requires: %{-r*}} \
Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \
BuildArch: noarch \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby for openSUSE:Factory checked in
at 2012-07-19 17:59:42
Comparing /work/SRC/openSUSE:Factory/ruby (Old)
and /work/SRC/openSUSE:Factory/.ruby.new (New)
Package is ruby, Maintainer is mrueck...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby/ruby.changes2012-07-12
14:50:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby.new/ruby.changes 2012-07-19
17:59:52.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 17 14:15:42 UTC 2012 - sasc...@suse.de
+
+- Fix ruby(abi) requires generation, the path glob was to broad
+
+---
Other differences:
--
++ rubygems.attr ++
--- /var/tmp/diff_new_pack.KF0Wyu/_old 2012-07-19 17:59:54.0 +0200
+++ /var/tmp/diff_new_pack.KF0Wyu/_new 2012-07-19 17:59:54.0 +0200
@@ -1,4 +1,4 @@
%__rubygems_requires %{_rpmconfigdir}/rubygemsdeps.sh --requires
%__rubygems_provides%{_rpmconfigdir}/rubygemsdeps.sh --provides
-%__rubygems_path^%{_libdir}/ruby/gems/.*/specifications
+%__rubygems_path^%{_libdir}/ruby/gems/[^/]*/specifications
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit site-config for openSUSE:Factory
Hello community, here is the log from the commit of package site-config for openSUSE:Factory checked in at 2012-07-19 18:00:09 Comparing /work/SRC/openSUSE:Factory/site-config (Old) and /work/SRC/openSUSE:Factory/.site-config.new (New) Package is site-config, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/site-config/site-config.changes 2012-06-28 16:59:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.site-config.new/site-config.changes 2012-07-19 18:00:10.0 +0200 @@ -11 +11 @@ -- Do not overwrite libexecdir specified by user. +- Do not overwrite libexecdir specified by user (bnc#758947). Other differences: -- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit systemd for openSUSE:Factory
Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2012-07-19 18:00:29
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
Package is systemd, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2012-07-14
13:16:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2012-07-19
18:00:31.0 +0200
@@ -1,0 +2,6 @@
+Wed Jul 18 13:14:37 UTC 2012 - fcro...@suse.com
+
+- Move systemd-analyse to a subpackage, to remove any python
+ dependencies from systemd main package (bnc#772039).
+
+---
Other differences:
--
++ systemd.spec ++
--- /var/tmp/diff_new_pack.KVn5wF/_old 2012-07-19 18:00:41.0 +0200
+++ /var/tmp/diff_new_pack.KVn5wF/_new 2012-07-19 18:00:41.0 +0200
@@ -16,8 +16,6 @@
#
-#don't require python, use recommends (bnc#716939)
-
Name: systemd
Url:http://www.freedesktop.org/wiki/Software/systemd
Version:44
@@ -54,7 +52,6 @@
Requires: systemd-presets-branding
Requires: udev = 172
Requires: util-linux = 2.21
-Recommends: dbus-1-python
Conflicts: filesystem 11.5
Conflicts: mkinitrd 2.7.0
Source0:
http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -132,6 +129,21 @@
%description sysvinit
Drop-in replacement of System V init tools.
+%package analyze
+Summary:Tool for processing systemd profiling information
+Group: System/Base
+Requires: %{name} = %{version}
+Requires: dbus-1-python
+Requires: python-cairo
+# for the systemd-analyze split:
+Conflicts: systemd 44-10
+
+%description analyze
+'systemd-analyze blame' lists which systemd unit needed how much time to finish
+initialization at boot.
+'systemd-analyze plot' renders an SVG visualizing the parallel start of units
+at boot.
+
%prep
%setup -q
%patch1 -p1
@@ -311,7 +323,6 @@
/bin/systemd-machine-id-setup
/usr/bin/systemd-nspawn
/usr/bin/systemd-stdio-bridge
-%attr(0755,root,root) /usr/bin/systemd-analyze
%{_sbindir}/systemd-sysv-convert
%{_libdir}/libsystemd-daemon.so.*
%{_libdir}/libsystemd-login.so.*
@@ -431,4 +442,7 @@
%{_mandir}/man8/telinit.8*
%{_mandir}/man8/runlevel.8*
+%files analyze
+%attr(0755,root,root) /usr/bin/systemd-analyze
+
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tomcat for openSUSE:Factory
Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked
in at 2012-07-19 18:00:48
Comparing /work/SRC/openSUSE:Factory/tomcat (Old)
and /work/SRC/openSUSE:Factory/.tomcat.new (New)
Package is tomcat, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes2012-06-18
17:34:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2012-07-19
18:00:50.0 +0200
@@ -1,0 +2,12 @@
+Thu Jul 19 08:48:31 UTC 2012 - mvysko...@suse.cz
+
+- fix bnc#771802 - systemd support is broken
+ * change type froking to simple as it does not make a sense run java in a
+background to emulate that
+ * remove the need of nested wrappers, so /usr/sbin/tomcat-sysd now relies on
+systemd features like User/EnvironmentFile
+ * workaround the 143 exit code in Stop phase - return 0 in this case
+ * merge the jsvc into tomcat-sysd code, the -jsvc-sysd is a symlink
+ * properly use jsvc with pid file to start and stop
+
+---
Old:
tomcat-7.0-jsvc.wrapper
tomcat-7.0-tomcat-jsvc-sysd
Other differences:
--
++ tomcat.spec ++
--- /var/tmp/diff_new_pack.DThtLC/_old 2012-07-19 18:00:53.0 +0200
+++ /var/tmp/diff_new_pack.DThtLC/_new 2012-07-19 18:00:53.0 +0200
@@ -61,16 +61,14 @@
Source8:servlet-api-OSGi-MANIFEST.MF
Source9:jsp-api-OSGi-MANIFEST.MF
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
-Source11: %{name}-%{major_version}.%{minor_version}.service
+Source11: tomcat-7.0.service
Source12: el-api-OSGi-MANIFEST.MF
Source13: jasper-el-OSGi-MANIFEST.MF
Source14: jasper-OSGi-MANIFEST.MF
Source15: tomcat-api-OSGi-MANIFEST.MF
Source16: tomcat-juli-OSGi-MANIFEST.MF
-Source17: %{name}-%{major_version}.%{minor_version}-tomcat-sysd
-Source18: %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd
-Source19: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper
-Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service
+Source17: tomcat-7.0-tomcat-sysd
+Source20: tomcat-7.0-jsvc.service
Source1000: tomcat-rpmlintrc
#PATCH-FIX-UPSTREAM: from jpackage.org package
@@ -189,6 +187,7 @@
%description jsp-2_2-api
Apache Tomcat JSP API implementation classes
+%if 0%{?suse_version} 1140
%package jsvc
Summary:Apache jsvc wrapper for Apache Tomcat as separate service
Group: Productivity/Networking/Web/Servers
@@ -199,7 +198,7 @@
Systemd service and wrapper scripts to start tomcat with jsvc,
which allows tomcat to perform some privileged operations
(e.g. bind to a port 1024) and then switch identity to a non-privileged user.
-
+%endif
%package lib
Summary:Libraries needed to run the Tomcat Web container
@@ -385,14 +384,9 @@
${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
%{__install} -m 0644 %{SOURCE17} \
${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
-%endif
-%{__install} -m 0644 %{SOURCE19} \
-${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc
-%if 0%{?suse_version} 1140
%{__install} -m 0644 %{SOURCE20} \
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service
-%{__install} -m 0644 %{SOURCE18} \
-${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd
+(cd ${RPM_BUILD_ROOT}%{_sbindir}; ln -s %{name}-sysd %{name}-jsvc-sysd)
%endif
%{__sed} -e s|\@\@\@TCLOG\@\@\@|%{logdir}|g %{SOURCE5} \
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
@@ -708,10 +702,9 @@
%{appdir}/examples
%{appdir}/sample
+%if 0%{?suse_version} 1140
%files jsvc
%defattr(755,root,root,0755)
-%{_sbindir}/%{name}-jsvc
-%if 0%{?suse_version} 1140
%{_sbindir}/%{name}-jsvc-sysd
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%endif
++ tomcat-7.0-jsvc.service ++
--- /var/tmp/diff_new_pack.DThtLC/_old 2012-07-19 18:00:53.0 +0200
+++ /var/tmp/diff_new_pack.DThtLC/_new 2012-07-19 18:00:53.0 +0200
@@ -1,17 +1,18 @@
# Systemd unit file for tomcat
#
-# To create clones of this service:
-# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined
-# before tomcat-sysd is called.
-# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
-# to override tomcat defaults
+# You can clone this service by:
+# 1.) Add a new EnvironmentFile declaring the new values for CATALINA_BASE
+# and others
+# 2.) Define new Environment=JSVC_PIDFILE=/var/run/tomcat-foo.pid if you want
+# to run more than one service
[Unit]
Description=Apache Tomcat Web Application Container JSVC wrapper
-After=syslog.target network.target
+After=network.target
[Service]
-Type=forking
+Type=simple
commit tomcat for openSUSE:12.2
Hello community,
here is the log from the commit of package tomcat for openSUSE:12.2 checked in
at 2012-07-19 18:00:53
Comparing /work/SRC/openSUSE:12.2/tomcat (Old)
and /work/SRC/openSUSE:12.2/.tomcat.new (New)
Package is tomcat, Maintainer is
Changes:
--- /work/SRC/openSUSE:12.2/tomcat/tomcat.changes 2012-06-25
15:56:06.0 +0200
+++ /work/SRC/openSUSE:12.2/.tomcat.new/tomcat.changes 2012-07-19
18:00:55.0 +0200
@@ -1,0 +2,12 @@
+Thu Jul 19 08:48:31 UTC 2012 - mvysko...@suse.cz
+
+- fix bnc#771802 - systemd support is broken
+ * change type froking to simple as it does not make a sense run java in a
+background to emulate that
+ * remove the need of nested wrappers, so /usr/sbin/tomcat-sysd now relies on
+systemd features like User/EnvironmentFile
+ * workaround the 143 exit code in Stop phase - return 0 in this case
+ * merge the jsvc into tomcat-sysd code, the -jsvc-sysd is a symlink
+ * properly use jsvc with pid file to start and stop
+
+---
Old:
tomcat-7.0-jsvc.wrapper
tomcat-7.0-tomcat-jsvc-sysd
Other differences:
--
++ tomcat.spec ++
--- /var/tmp/diff_new_pack.xngCrI/_old 2012-07-19 18:00:55.0 +0200
+++ /var/tmp/diff_new_pack.xngCrI/_new 2012-07-19 18:00:55.0 +0200
@@ -61,16 +61,14 @@
Source8:servlet-api-OSGi-MANIFEST.MF
Source9:jsp-api-OSGi-MANIFEST.MF
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
-Source11: %{name}-%{major_version}.%{minor_version}.service
+Source11: tomcat-7.0.service
Source12: el-api-OSGi-MANIFEST.MF
Source13: jasper-el-OSGi-MANIFEST.MF
Source14: jasper-OSGi-MANIFEST.MF
Source15: tomcat-api-OSGi-MANIFEST.MF
Source16: tomcat-juli-OSGi-MANIFEST.MF
-Source17: %{name}-%{major_version}.%{minor_version}-tomcat-sysd
-Source18: %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd
-Source19: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper
-Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service
+Source17: tomcat-7.0-tomcat-sysd
+Source20: tomcat-7.0-jsvc.service
Source1000: tomcat-rpmlintrc
#PATCH-FIX-UPSTREAM: from jpackage.org package
@@ -189,6 +187,7 @@
%description jsp-2_2-api
Apache Tomcat JSP API implementation classes
+%if 0%{?suse_version} 1140
%package jsvc
Summary:Apache jsvc wrapper for Apache Tomcat as separate service
Group: Productivity/Networking/Web/Servers
@@ -199,7 +198,7 @@
Systemd service and wrapper scripts to start tomcat with jsvc,
which allows tomcat to perform some privileged operations
(e.g. bind to a port 1024) and then switch identity to a non-privileged user.
-
+%endif
%package lib
Summary:Libraries needed to run the Tomcat Web container
@@ -385,14 +384,9 @@
${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
%{__install} -m 0644 %{SOURCE17} \
${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
-%endif
-%{__install} -m 0644 %{SOURCE19} \
-${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc
-%if 0%{?suse_version} 1140
%{__install} -m 0644 %{SOURCE20} \
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service
-%{__install} -m 0644 %{SOURCE18} \
-${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd
+(cd ${RPM_BUILD_ROOT}%{_sbindir}; ln -s %{name}-sysd %{name}-jsvc-sysd)
%endif
%{__sed} -e s|\@\@\@TCLOG\@\@\@|%{logdir}|g %{SOURCE5} \
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
@@ -708,10 +702,9 @@
%{appdir}/examples
%{appdir}/sample
+%if 0%{?suse_version} 1140
%files jsvc
%defattr(755,root,root,0755)
-%{_sbindir}/%{name}-jsvc
-%if 0%{?suse_version} 1140
%{_sbindir}/%{name}-jsvc-sysd
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%endif
++ tomcat-7.0-jsvc.service ++
--- /var/tmp/diff_new_pack.xngCrI/_old 2012-07-19 18:00:56.0 +0200
+++ /var/tmp/diff_new_pack.xngCrI/_new 2012-07-19 18:00:56.0 +0200
@@ -1,17 +1,18 @@
# Systemd unit file for tomcat
#
-# To create clones of this service:
-# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined
-# before tomcat-sysd is called.
-# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
-# to override tomcat defaults
+# You can clone this service by:
+# 1.) Add a new EnvironmentFile declaring the new values for CATALINA_BASE
+# and others
+# 2.) Define new Environment=JSVC_PIDFILE=/var/run/tomcat-foo.pid if you want
+# to run more than one service
[Unit]
Description=Apache Tomcat Web Application Container JSVC wrapper
-After=syslog.target network.target
+After=network.target
[Service]
-Type=forking
+Type=simple
