Hello community, here is the log from the commit of package PackageKit-branding-openSUSE for openSUSE:Factory checked in at 2013-12-30 11:04:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-10-04 12:10:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new/PackageKit-branding-openSUSE.changes 2013-12-30 11:04:51.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 23 14:57:21 UTC 2013 - dimstar@opensuse.org + +- Rebase PackageKit-branding-vendor.patch and + PackageKit-branding-default-config.patch for PackageKit 0.8.14. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.FrtFpJ/_old 2013-12-30 11:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FrtFpJ/_new 2013-12-30 11:04:52.000000000 +0100 @@ -37,7 +37,7 @@ # 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 +BuildRequires: PackageKit-branding-upstream >= 0.8.14 %define packagekit_version %(rpm -q --qf '%%{version}' PackageKit) Requires: PackageKit = %{packagekit_version} Provides: PackageKit-branding = %{packagekit_version} ++++++ PackageKit-branding-default-config.patch ++++++ --- /var/tmp/diff_new_pack.FrtFpJ/_old 2013-12-30 11:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FrtFpJ/_new 2013-12-30 11:04:52.000000000 +0100 @@ -1,6 +1,6 @@ ---- PackageKit.conf.old 2013-03-04 16:54:14.358972628 +0100 -+++ PackageKit.conf 2013-03-04 16:52:37.432034701 +0100 -@@ -37,7 +37,7 @@ +--- PackageKit.conf.orig 2013-12-23 15:09:37.018505990 +0100 ++++ PackageKit.conf 2013-12-23 15:10:06.895787569 +0100 +@@ -6,7 +6,7 @@ # Shut down the daemon after this many seconds idle. 0 means don't shutdown. # # default=300 @@ -9,7 +9,7 @@ # Unlock the backend after this many seconds idle. # -@@ -124,7 +124,7 @@ +@@ -46,7 +46,7 @@ # NOTE: Don't enable this for backends that are slow doing SearchFile() # # default=true @@ -18,9 +18,3 @@ # Update the package cache on PackageKit transactions # The cache is used by client applications to fetch -@@ -323,4 +323,4 @@ - # show a 'Reboot and install updates' item to the user. - # - # default=true --WritePreparedUpdates=true -+WritePreparedUpdates=false ++++++ PackageKit-branding-vendor.patch ++++++ --- /var/tmp/diff_new_pack.FrtFpJ/_old 2013-12-30 11:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FrtFpJ/_new 2013-12-30 11:04:52.000000000 +0100 @@ -1,5 +1,5 @@ ---- Vendor.conf.old 2010-02-12 12:31:48.000000000 +0100 -+++ Vendor.conf 2010-02-12 13:19:06.000000000 +0100 +--- Vendor.conf.orig 2013-12-23 14:35:34.448318039 +0100 ++++ Vendor.conf 2013-12-23 14:35:52.325877789 +0100 @@ -12,7 +12,7 @@ # If the value is set to 'none' then no link is shown. # @@ -18,15 +18,3 @@ # The URL which is shown to the user when hardware drivers could not be found. # It should explain why some hardware is not supported, and links to futher -@@ -54,9 +54,9 @@ - # The vendor name shown for the 'vendor' group - # - # default=My Vendor --VendorName=My Vendor -+VendorName=SUSE - - # The vendor icon name shown for the 'vendor' group - # - # default=emblem-favorite --VendorIcon=emblem-favorite -+VendorIcon=distributor ++++++ PackageKit-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.FrtFpJ/_old 2013-12-30 11:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FrtFpJ/_new 2013-12-30 11:04:52.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 23 14:57:21 UTC 2013 - dimstar@opensuse.org + +- Rebase PackageKit-branding-vendor.patch and + PackageKit-branding-default-config.patch for PackageKit 0.8.14. + +------------------------------------------------------------------- Fri Oct 4 07:32:46 UTC 2013 - dimstar@opensuse.org - Do not package %{_sysconfdir}/PackageKit/CommandNotFound.conf, as ++++++ PackageKit-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.FrtFpJ/_old 2013-12-30 11:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FrtFpJ/_new 2013-12-30 11:04:52.000000000 +0100 @@ -36,7 +36,7 @@ # 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 +BuildRequires: PackageKit-branding-upstream >= 0.8.14 %define packagekit_version %(rpm -q --qf '%%{version}' PackageKit) Requires: PackageKit = %{packagekit_version} Provides: PackageKit-branding = %{packagekit_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org