Hello community,
here is the log from the commit of package branding-basedonopensuse for
openSUSE:Factory checked in at 2013-01-11 15:53:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/branding-basedonopensuse (Old)
and /work/SRC/openSUSE:Factory/.branding-basedonopensuse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-basedonopensuse", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/branding-basedonopensuse/branding-basedonopensuse.changes
2012-09-04 01:33:22.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.branding-basedonopensuse.new/branding-basedonopensuse.changes
2013-01-11 15:54:01.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 8 15:49:53 UTC 2013 - [email protected]
+
+- update the list of branding packages
+
+-------------------------------------------------------------------
Old:
----
post.bootsplash
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ branding-basedonopensuse.spec ++++++
--- /var/tmp/diff_new_pack.Frhlag/_old 2013-01-11 15:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.Frhlag/_new 2013-01-11 15:54:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package branding-basedonopensuse
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
#BRQ-START
BuildRequires: MozillaFirefox-branding-openSUSE
BuildRequires: PackageKit-branding-openSUSE
-BuildRequires: bootsplash-branding-openSUSE
+BuildRequires: awesome-branding-openSUSE
BuildRequires: compiz-branding-openSUSE
BuildRequires: dynamic-wallpaper-branding-openSUSE
BuildRequires: epiphany-branding-openSUSE
@@ -82,7 +82,7 @@
BuildRequires: yast2-qt-branding-openSUSE
#BRQ-END
-Version: 12.2
+Version: 12.3
Release: 0
Summary: (De)branded openSUSE theme
License: MIT
@@ -95,7 +95,6 @@
Source100: update-list.sh
Source101: extract.pl
-Source102: post.bootsplash
Source103: post.gfxboot
Source104: post.dynamic-wallpaper
Source105: postun.grub2
@@ -138,7 +137,7 @@
cp /usr/share/doc/packages/branding-openSUSE/COPYING .
packages=""
#PSTART
-packages="$packages bootsplash-branding-openSUSE"
+packages="$packages awesome-branding-openSUSE"
packages="$packages compiz-branding-openSUSE"
packages="$packages dynamic-wallpaper-branding-openSUSE"
packages="$packages epiphany-branding-openSUSE"
@@ -245,12 +244,12 @@
done
grep -v SUSEgreeter files.kdebase4-workspace-branding-openSUSE > t && mv t
files.kdebase4-workspace-branding-openSUSE
-mv
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bootsplash-branding-{openSUSE,basedonopensuse}
+#mv
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bootsplash-branding-{openSUSE,basedonopensuse}
rm -r $RPM_BUILD_ROOT/etc/bootsplash/themes/openSUSE
-grep -v "/etc/bootsplash/themes/openSUSE/config"
files.bootsplash-branding-openSUSE > t && mv t
files.bootsplash-branding-openSUSE
-echo "/etc/bootsplash/themes/basedonopensuse/config" >>
files.bootsplash-branding-openSUSE
-sed -i -e 's,openSUSE,basedonopensuse,' files.bootsplash-branding-openSUSE
+#grep -v "/etc/bootsplash/themes/openSUSE/config"
files.bootsplash-branding-openSUSE > t && mv t
files.bootsplash-branding-openSUSE
+#echo "/etc/bootsplash/themes/basedonopensuse/config" >>
files.bootsplash-branding-openSUSE
+#sed -i -e 's,openSUSE,basedonopensuse,' files.bootsplash-branding-openSUSE
sed -i -e 's,openSUSE,basedonopensuse,' files.gfxboot-branding-openSUSE
sed -i -e 's,openSUSE,basedonopensuse,' files.grub2-branding-openSUSE
sed -i -e 's,openSUSE,basedonopensuse,g' files.plymouth-branding-openSUSE
@@ -274,7 +273,7 @@
make -C openSUSE install DESTDIR=%{buildroot} THEME=%theme_name
-sed -i -e 's,openSUSE,basedonopensuse,'
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bootsplash-branding-basedonopensuse
+#sed -i -e 's,openSUSE,basedonopensuse,'
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bootsplash-branding-basedonopensuse
mv %{buildroot}/usr/share/plymouth/themes/basedonopensuse/openSUSE.plymouth
%{buildroot}/usr/share/plymouth/themes/basedonopensuse/basedonopensuse.plymouth
mv %{buildroot}/usr/share/plymouth/themes/basedonopensuse/openSUSE.script
%{buildroot}/usr/share/plymouth/themes/basedonopensuse/basedonopensuse.script
@@ -291,33 +290,24 @@
/etc/SuSE-brand
# TIL HERE
-%package -n bootsplash-branding-basedonopensuse
-Summary: Provides bootsplash branding
-License: BSD-3-Clause
+%package -n awesome-branding-basedonopensuse
+Summary: Provides awesome branding
+License: GPL-2.0+
Group: System/Fhs
-Provides: bootsplash-branding
+Provides: awesome-branding
Requires: branding-basedonopensuse
-Conflicts: otherproviders(bootsplash-branding)
-Supplements: packageand(bootsplash:branding-basedonopensuse)
-Requires: bootsplash
-Requires: coreutils
-Requires: diffutils
-Requires: fillup
-Requires: grep
-Requires: mkinitrd
-Requires: perl
-
-%description -n bootsplash-branding-basedonopensuse
-Debranded copy of openSUSE branding for bootsplash
+Conflicts: otherproviders(awesome-branding)
+Supplements: packageand(awesome:branding-basedonopensuse)
+Requires: awesome-freedesktop
+Requires: awesome-vicious
+Requires: gnome-icon-theme
+Requires: nitrogen
+Requires: xscreensaver
-%files -f files.bootsplash-branding-openSUSE -n
bootsplash-branding-basedonopensuse
+%description -n awesome-branding-basedonopensuse
+Debranded copy of openSUSE branding for awesome
-%post -n bootsplash-branding-basedonopensuse
-%{fillup_only -ns bootsplash branding-basedonopensuse }
-perl -pi -e 's/^(THEME=).*/$1"basedonopensuse"/' /etc/sysconfig/bootsplash
-if test -s /etc/sysconfig/bootloader ; then
-/sbin/mkinitrd
-fi
+%files -f files.awesome-branding-openSUSE -n awesome-branding-basedonopensuse
%package -n compiz-branding-basedonopensuse
Summary: Provides compiz branding
@@ -535,6 +525,7 @@
Provides: grub2-branding
Requires: branding-basedonopensuse
Conflicts: otherproviders(grub2-branding)
+Supplements: packageand(grub2:branding-basedonopensuse)
Requires: /usr/bin/perl
Requires: grub2
@@ -762,7 +753,8 @@
Requires: branding-basedonopensuse
Conflicts: otherproviders(libgarcon-branding)
Supplements: packageand(libgarcon-data:branding-basedonopensuse)
-Requires: desktop-data
+Requires: desktop-data-openSUSE
+Requires: wallpaper-branding
Requires: xfce4-settings-branding-basedonopensuse
%description -n libgarcon-branding-basedonopensuse
@@ -876,7 +868,7 @@
%package -n MozillaFirefox-branding-basedonopensuse
Summary: Provides MozillaFirefox branding
-License: BSD-3-Clause ; GPL-2.0+
+License: BSD-3-Clause and GPL-2.0+
Group: System/Fhs
Provides: MozillaFirefox-branding
Requires: branding-basedonopensuse
@@ -921,6 +913,22 @@
%files -f files.plymouth-branding-openSUSE -n plymouth-branding-basedonopensuse
+%post -n plymouth-branding-basedonopensuse
+if [ ! -e /.buildenv ]; then
+ export LIB=%{_libdir}
+ if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" -o
"$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" -o
"$(%{_sbindir}/plymouth-set-default-theme)" == "basedonopensuse" ]; then
+ %{_sbindir}/plymouth-set-default-theme -R openSUSE
+ fi
+fi
+
+%postun -n plymouth-branding-basedonopensuse
+if [ $1 -eq 0 ]; then
+ export LIB=%{_libdir}
+ if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "basedonopensuse" ];
then
+ %{_sbindir}/plymouth-set-default-theme -R --reset
+ fi
+fi
+
%package -n splashy-branding-basedonopensuse
Summary: Provides splashy branding
License: GPL-2.0+
@@ -1038,6 +1046,7 @@
Requires: branding-basedonopensuse
Conflicts: otherproviders(xfce4-session-branding)
Supplements: packageand(xfce4-session:branding-basedonopensuse)
+Requires: desktop-file-utils
%description -n xfce4-session-branding-basedonopensuse
Debranded copy of openSUSE branding for xfce4-session
@@ -1052,7 +1061,7 @@
Requires: branding-basedonopensuse
Conflicts: otherproviders(xfce4-settings-branding)
Supplements: packageand(xfce4-settings:branding-basedonopensuse)
-Requires: desktop-data
+Requires: desktop-data-openSUSE
Requires: gtk2-metatheme-adwaita
Requires: gtk3-metatheme-adwaita
Requires: openSUSE-xfce-icon-theme
@@ -1084,6 +1093,7 @@
Requires: branding-basedonopensuse
Conflicts: otherproviders(xfdesktop-branding)
Supplements: packageand(xfdesktop:branding-basedonopensuse)
+Requires: desktop-data-openSUSE
Requires: wallpaper-branding
%description -n xfdesktop-branding-basedonopensuse
@@ -1138,20 +1148,4 @@
%files -f files.yast2-qt-branding-openSUSE -n yast2-qt-branding-basedonopensuse
-%post -n plymouth-branding-basedonopensuse
-if [ ! -e /.buildenv ]; then
- export LIB=%{_libdir}
- if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" -o
"$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" -o
"$(%{_sbindir}/plymouth-set-default-theme)" == "basedonopensuse" ]; then
- %{_sbindir}/plymouth-set-default-theme -R basedonopensuse
- fi
-fi
-
-%postun -n plymouth-branding-basedonopensuse
-if [ $1 -eq 0 ]; then
- export LIB=%{_libdir}
- if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "basedonopensuse" ];
then
- %{_sbindir}/plymouth-set-default-theme -R --reset
- fi
-fi
-
%changelog
++++++ openSUSE.tar.gz ++++++
/work/SRC/openSUSE:Factory/branding-basedonopensuse/openSUSE.tar.gz
/work/SRC/openSUSE:Factory/.branding-basedonopensuse.new/openSUSE.tar.gz
differ: char 5, line 1
++++++ update-list.sh ++++++
--- /var/tmp/diff_new_pack.Frhlag/_old 2013-01-11 15:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.Frhlag/_new 2013-01-11 15:54:04.000000000 +0100
@@ -4,7 +4,7 @@
packs=$(mktemp)
curl -s
http://download.opensuse.org/factory/repo/oss/suse/setup/descr/packages.gz |
gzip -c -d > $packs
-list=$(grep ^=Pkg:.*branding-openSUSE $packs | cut '-d ' -f2 | sort -u | grep
-v '^branding-openSUSE$')
+list=$(grep ^=Pkg:.*branding-openSUSE $packs | cut '-d ' -f2 | sort -u | grep
-v '^branding-openSUSE$' | grep -v fcitx)
export LC_ALL=C
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]