Hello community,
here is the log from the commit of package PackageKit-branding-openSUSE for
openSUSE:Factory checked in at 2014-10-29 21:09:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/PackageKit-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit-branding-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/PackageKit-branding-openSUSE/PackageKit-branding-openSUSE.changes
2014-09-23 17:16:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new/PackageKit-branding-openSUSE.changes
2014-10-29 21:09:15.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Oct 21 19:19:22 UTC 2014 - dims...@opensuse.org
+
+- Rebase PackageKit-branding-default-config.patch for
+ PackageKit 1.0.1.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ PackageKit-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.azk1dV/_old 2014-10-29 21:09:16.000000000 +0100
+++ /var/tmp/diff_new_pack.azk1dV/_new 2014-10-29 21:09:16.000000000 +0100
@@ -33,11 +33,11 @@
Patch0: PackageKit-branding-vendor.patch
# PATCH-FEATURE-OPENSUSE PackageKit-branding-default-config.patch
vu...@opensues.org -- Change some default configuration
Patch1: PackageKit-branding-default-config.patch
-BuildRequires: PackageKit >= 0.8
+BuildRequires: PackageKit >= 1.0.1
# To be in sync with upstream defaults, do branding as a patch for upstream
file.
# WARNING: As this package conflicts with PackageKit-branding-openSUSE, you
cannot
# reuse build root. You have to build in a clean build root every
time!
-BuildRequires: PackageKit-branding-upstream >= 0.8.14
+BuildRequires: PackageKit-branding-upstream >= 1.0.1
%define packagekit_version %(rpm -q --qf '%%{version}' PackageKit)
Requires: PackageKit = %{packagekit_version}
Provides: PackageKit-branding = %{packagekit_version}
@@ -60,7 +60,7 @@
cp -a %{SOURCE0} .
cp -a %{_sysconfdir}/PackageKit/* .
%patch0
-%patch1
+%patch1 -p1
%build
++++++ PackageKit-branding-default-config.patch ++++++
--- /var/tmp/diff_new_pack.azk1dV/_old 2014-10-29 21:09:16.000000000 +0100
+++ /var/tmp/diff_new_pack.azk1dV/_new 2014-10-29 21:09:16.000000000 +0100
@@ -1,15 +1,13 @@
-diff -ur a/PackageKit.conf b/PackageKit.conf
---- PackageKit.conf 2014-09-10 16:55:20.039417673 +0200
-+++ PackageKit.conf 2014-09-10 16:59:09.762454591 +0200
-@@ -2,3 +2,11 @@
- # should not have to change anything.
+--- a/PackageKit.conf 2014-10-21 21:16:35.698980297 +0200
++++ b/PackageKit.conf 2014-10-21 21:18:59.893478751 +0200
+@@ -16,6 +16,10 @@
- [Daemon]
-+
-+# Shut down the daemon after this many seconds idle. 0 means don't shutdown.
-+#
-+# default=300
+ # Shut down the daemon after this many seconds idle. 0 means don't shutdown.
+ #ShutdownTimeout=300
+#
+# for openSUSE, we want this shorter so it does not interfere with zypp/yast
all the time
++# until boo#899755 is fixed (in fact it's a libzypp issue, NOT a PK issue)
+ShutdownTimeout=15
-+
+
+ # Keep the packages after they have been downloaded
+ #KeepCache=false
++++++ PackageKit-branding.changes.in ++++++
--- /var/tmp/diff_new_pack.azk1dV/_old 2014-10-29 21:09:16.000000000 +0100
+++ /var/tmp/diff_new_pack.azk1dV/_new 2014-10-29 21:09:16.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Oct 21 19:19:22 UTC 2014 - dims...@opensuse.org
+
+- Rebase PackageKit-branding-default-config.patch for
+ PackageKit 1.0.1.
+
+-------------------------------------------------------------------
+Wed Sep 10 15:00:03 UTC 2014 - dims...@opensuse.org
+
+- Rebase PackageKit-branding-default-config.patch for
+ PackageKit 0.9.6.
+
+-------------------------------------------------------------------
Tue Apr 15 16:32:40 UTC 2014 - zai...@opensuse.org
- Bump version to 13.2 for next version of openSUSE.
++++++ PackageKit-branding.spec.in ++++++
--- /var/tmp/diff_new_pack.azk1dV/_old 2014-10-29 21:09:16.000000000 +0100
+++ /var/tmp/diff_new_pack.azk1dV/_new 2014-10-29 21:09:16.000000000 +0100
@@ -32,11 +32,11 @@
Patch0: PackageKit-branding-vendor.patch
# PATCH-FEATURE-OPENSUSE PackageKit-branding-default-config.patch
vu...@opensues.org -- Change some default configuration
Patch1: PackageKit-branding-default-config.patch
-BuildRequires: PackageKit >= 0.9.6
+BuildRequires: PackageKit >= 1.0.1
# To be in sync with upstream defaults, do branding as a patch for upstream
file.
# WARNING: As this package conflicts with
PackageKit-branding-%{branding_name}, you cannot
# reuse build root. You have to build in a clean build root every
time!
-BuildRequires: PackageKit-branding-upstream >= 0.9.6
+BuildRequires: PackageKit-branding-upstream >= 1.0.1
%define packagekit_version %(rpm -q --qf '%%{version}' PackageKit)
Requires: PackageKit = %{packagekit_version}
Provides: PackageKit-branding = %{packagekit_version}
@@ -59,7 +59,7 @@
cp -a %{SOURCE0} .
cp -a %{_sysconfdir}/PackageKit/* .
%patch0
-%patch1
+%patch1 -p1
%build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
