Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2012-04-24 11:22:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-branding-openSUSE", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2012-01-24 12:24:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2012-04-24 11:22:48.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Apr 1 12:43:17 UTC 2012 - [email protected] + +- added midori-branding-openSUSE + +------------------------------------------------------------------- +Sat Mar 31 14:59:41 UTC 2012 - [email protected] + +- own %{_datadir}/desktop-directories/ for >= 12.1 + +------------------------------------------------------------------- +Fri Mar 30 22:39:56 UTC 2012 - [email protected] + +- enable GNOME compatibility mode in order to start gnome-keyring + by default (bnc#754700) +- adapt to renamed packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.kCU2Bm/_old 2012-04-24 11:22:51.000000000 +0200 +++ /var/tmp/diff_new_pack.kCU2Bm/_new 2012-04-24 11:22:51.000000000 +0200 @@ -15,36 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define xfce4_panel_version %(rpm -q --queryformat '%{VERSION}' xfce4-panel) -%define xfce4_session_version %(rpm -q --queryformat '%{VERSION}' xfce4-session) -%define xfce4_settings_version %(rpm -q --queryformat '%{VERSION}' xfce4-settings) -%define xfdesktop_version %(rpm -q --queryformat '%{VERSION}' xfdesktop) -%define libgarcon_version %(rpm -q --queryformat '%{VERSION}' libgarcon-1-0) -%define libxfce4ui_version %(rpm -q --queryformat '%{VERSION}' libxfce4ui) -%define xfce4_notifyd_version %(rpm -q --queryformat '%{VERSION}' xfce4-notifyd) -%define exo_version %(rpm -q --queryformat '%{VERSION}' exo) -%define xfwm4_version %(rpm -q --queryformat '%{VERSION}' xfwm4) -%if 0%{?suse_version} > 1200 -%define thunar_volman_version %(rpm -q --queryformat '%{VERSION}' thunar-volman) + +%define xfce4_panel_version %(rpm -q --queryformat '%%{VERSION}' xfce4-panel) +%define xfce4_session_version %(rpm -q --queryformat '%%{VERSION}' xfce4-session) +%define xfce4_settings_version %(rpm -q --queryformat '%%{VERSION}' xfce4-settings) +%define xfdesktop_version %(rpm -q --queryformat '%%{VERSION}' xfdesktop) +%define libgarcon_version %(rpm -q --queryformat '%%{VERSION}' libgarcon-1-0) +%define libxfce4ui_version %(rpm -q --queryformat '%%{VERSION}' libxfce4ui-1-0) +%define xfce4_notifyd_version %(rpm -q --queryformat '%%{VERSION}' xfce4-notifyd) +%define exo_version %(rpm -q --queryformat '%%{VERSION}' exo-data) +%define xfwm4_version %(rpm -q --queryformat '%%{VERSION}' xfwm4) +%define midori_version %(rpm -q --queryformat '%%{VERSION}' midori) +%if 0%{?suse_version} >= 1210 +%define thunar_volman_version %(rpm -q --queryformat '%%{VERSION}' thunar-volman) %endif Name: xfce4-branding-openSUSE Version: 4.8.0 Release: 0 -Summary: openSUSE branding of the Xfce desktop environment +Summary: openSUSE Branding of the Xfce desktop environment License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE -Url: http://www.xfce.org/ -%if 0%{?suse_version} > 1200 +Url: http://www.opensuse.org/ +%if 0%{?suse_version} >= 1210 Source: %{name}-%{version}.tar.bz2 %else Source: %{name}-%{version}-11.4.tar.bz2 %endif Source1: COPYING Source2: COPYING.xfce4-splash-openSUSE-11.4 -BuildRequires: exo +BuildRequires: exo-branding-upstream +BuildRequires: exo-data BuildRequires: libgarcon-1-0 -BuildRequires: libxfce4ui +BuildRequires: libxfce4ui-1-0 +BuildRequires: midori +BuildRequires: midori-branding-upstream BuildRequires: xfce4-notifyd BuildRequires: xfce4-panel BuildRequires: xfce4-session @@ -52,7 +57,7 @@ BuildRequires: xfce4-settings BuildRequires: xfdesktop BuildRequires: xfwm4 -%if 0%{?suse_version} > 1200 +%if 0%{?suse_version} >= 1210 BuildRequires: thunar-volman %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,11 +67,11 @@ This package provides the openSUSE look and feel for the Xfce desktop environment. %package -n xfce4-panel-branding-openSUSE -Summary: openSUSE branding of xfce4-panel +Summary: openSUSE Branding of xfce4-panel License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE -Requires: exo -%if 0%{?suse_version} > 1200 +Requires: exo-tools +%if 0%{?suse_version} >= 1210 Requires: xfce4-panel-plugin-datetime %endif Conflicts: otherproviders(xfce4-panel-branding) @@ -77,7 +82,7 @@ This package provides the openSUSE look and feel for the Xfce Panel. %package -n xfce4-session-branding-openSUSE -Summary: openSUSE branding of xfce4-session +Summary: openSUSE Branding of xfce4-session License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Conflicts: otherproviders(xfce4-session-branding) @@ -88,12 +93,12 @@ This package provides the openSUSE look and feel for the Xfce Session Manager. %package -n xfce4-settings-branding-openSUSE -Summary: openSUSE branding of xfce4-settings +Summary: openSUSE Branding of xfce4-settings License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE # should bring in either desktop-data-openSUSE or desktop-data-SLED Requires: desktop-data -%if 0%{?suse_version} > 1200 +%if 0%{?suse_version} >= 1210 Requires: gtk2-metatheme-adwaita Requires: gtk3-metatheme-adwaita # built from branding-openSUSE @@ -109,18 +114,18 @@ This package provides the openSUSE look and feel for Xfce. %package -n xfdesktop-branding-openSUSE -Summary: openSUSE branding of xfce4-settings +Summary: openSUSE Branding of xfce4-settings License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE -%if 0%{?suse_version} > 1200 +%if 0%{?suse_version} >= 1210 Requires: wallpaper-branding %else # should bring in either desktop-data-openSUSE or desktop-data-SLED Requires: desktop-data %endif Conflicts: otherproviders(xfdesktop-branding) -Provides: xfdesktop-branding = %{xfdesktop_version} Provides: xfce4-desktop-branding-openSUSE = %{xfdesktop_version} +Provides: xfdesktop-branding = %{xfdesktop_version} Obsoletes: xfce4-desktop-branding-openSUSE < %{xfdesktop_version} Supplements: packageand(xfdesktop:branding-openSUSE) @@ -128,7 +133,7 @@ This package provides the openSUSE look and feel for the Xfce Desktop Manager. %package -n libgarcon-branding-openSUSE -Summary: openSUSE branding of libgarcon-1-0 +Summary: openSUSE Branding of libgarcon-1-0 License: CC-BY-SA-3.0 and GPL-2.0 Group: System/GUI/XFCE # should bring in either desktop-data-openSUSE or desktop-data-SLED @@ -141,18 +146,18 @@ This package provides the openSUSE look and feel for Garcon. %package -n libxfce4ui-branding-openSUSE -Summary: openSUSE branding of libxfce4ui +Summary: openSUSE Branding of libxfce4ui License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Conflicts: otherproviders(libxfce4ui-branding) Provides: libxfce4ui-branding = %{libxfce4ui_version} -Supplements: packageand(libxfce4ui:branding-openSUSE) +Supplements: packageand(libxfce4ui-1-0:branding-openSUSE) %description -n libxfce4ui-branding-openSUSE This package provides the openSUSE look and feel for the libxfce4ui library. %package -n xfce4-notifyd-branding-openSUSE -Summary: openSUSE branding of xfce4-notifyd +Summary: openSUSE Branding of xfce4-notifyd License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Conflicts: otherproviders(xfce4-notifyd-branding) @@ -163,18 +168,18 @@ This package provides the openSUSE look and feel for the Xfce Notification Daemon. %package -n exo-branding-openSUSE -Summary: openSUSE branding of exo +Summary: openSUSE Branding of exo License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Conflicts: otherproviders(exo-branding) Provides: exo-branding = %{exo_version} -Supplements: packageand(exo:branding-openSUSE) +Supplements: packageand(exo-data:branding-openSUSE) %description -n exo-branding-openSUSE This package provides the openSUSE look and feel for the exo library. %package -n xfwm4-branding-openSUSE -Summary: openSUSE branding of xfwm4 +Summary: openSUSE Branding of xfwm4 License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Requires: fifth-leg-font @@ -185,10 +190,9 @@ %description -n xfwm4-branding-openSUSE This package provides the openSUSE look and feel for the xfwm4 window manager. -%if 0%{?suse_version} > 1200 - +%if 0%{?suse_version} >= 1210 %package -n thunar-volman-branding-openSUSE -Summary: openSUSE branding of thunar-volman +Summary: openSUSE Branding of thunar-volman License: CC-BY-SA-3.0 and GPL-2.0+ Group: System/GUI/XFCE Conflicts: otherproviders(thunar-volman-branding) @@ -200,6 +204,17 @@ %endif +%package -n midori-branding-openSUSE +Summary: openSUSE Branding of midori +License: CC-BY-SA-3.0 and GPL-2.0+ +Group: System/GUI/XFCE +Conflicts: otherproviders(midori-branding) +Provides: midori-branding = %{midori_version} +Supplements: packageand(midori:branding-openSUSE) + +%description -n midori-branding-openSUSE +This package provides the openSUSE look and feel for the Midori web browser. + %prep %setup -q cp -p %{SOURCE1} . @@ -209,6 +224,15 @@ sed 's|Hidden=false|Hidden=true|' \ %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop \ >etc/xdg/autostart/xfce4-tips-autostart.desktop +cp %{_sysconfdir}/xdg/midori/search etc/xdg/midori/search +cat >etc/xdg/midori/search <<EOF + +[openSUSE Software] +name=openSUSE Software +text=Search for openSUSE packages +uri=http://software.opensuse.org/search?p=1&baseproject=ALL&q=%%s +token=os +EOF %install find etc usr -depth -print | cpio -pvd %{buildroot} @@ -220,7 +244,7 @@ %defattr(-,root,root) %doc COPYING %dir %{_sysconfdir}/xdg/xfce4 -%if 0%{?suse_version} > 1200 +%if 0%{?suse_version} >= 1210 %dir %{_sysconfdir}/xdg/xfce4/panel %config %{_sysconfdir}/xdg/xfce4/panel/datetime-12.rc %endif @@ -246,7 +270,7 @@ %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml # do not package it for 12.1+ -%if 0%{?suse_version} < 1200 +%if 0%{?suse_version} < 1210 %doc COPYING.xfce4-splash-openSUSE %{_datadir}/pixmaps/xfce4-splash-openSUSE.png %endif @@ -264,7 +288,8 @@ %doc COPYING %dir %{_sysconfdir}/xdg/menus %config %{_sysconfdir}/xdg/menus/xfce-applications.menu -%if 0%{?suse_version} > 1200 +%if 0%{?suse_version} >= 1210 +%dir %{_datadir}/desktop-directories/ %{_datadir}/desktop-directories/xfce-preferences.directory %{_datadir}/desktop-directories/xfce-administration.directory %endif @@ -299,8 +324,7 @@ %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml -%if 0%{?suse_version} > 1200 - +%if 0%{?suse_version} >= 1210 %files -n thunar-volman-branding-openSUSE %defattr(-,root,root) %doc COPYING @@ -310,4 +334,11 @@ %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml %endif +%files -n midori-branding-openSUSE +%defattr(-,root,root) +%doc COPYING +%dir %{_sysconfdir}/xdg/midori +%config(noreplace) %{_sysconfdir}/xdg/midori/search +%config(noreplace) %{_sysconfdir}/xdg/midori/config + %changelog ++++++ xfce4-branding-openSUSE-4.8.0-11.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config --- old/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config 2012-04-01 15:57:15.000000000 +0200 @@ -0,0 +1,2 @@ +[settings] +homepage=http://www.opensuse.org/ ++++++ xfce4-branding-openSUSE-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config new/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config --- old/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.8.0/etc/xdg/midori/config 2012-04-01 15:57:06.000000000 +0200 @@ -0,0 +1,2 @@ +[settings] +homepage=http://www.opensuse.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new/xfce4-branding-openSUSE-4.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --- old/xfce4-branding-openSUSE-4.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2011-02-17 10:33:34.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.8.0/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-03-31 00:38:56.000000000 +0200 @@ -47,4 +47,7 @@ </property> </property> </property> + <property name="compat" type="empty"> + <property name="LaunchGNOME" type="bool" value="true"/> + </property> </channel> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
