Hello community,
here is the log from the commit of package xfce4-branding-openSUSE for
openSUSE:Factory checked in at 2013-01-22 18:18:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 "xfce-maintain...@suse.de"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes
2012-10-24 10:24:35.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes
2013-01-22 18:18:55.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 5 09:46:03 UTC 2012 - g...@opensuse.org
+
+- remove support for openSUSE 11.4
+
+-------------------------------------------------------------------
Old:
----
xfce4-branding-openSUSE_11.4-4.10.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.VLuxXi/_old 2013-01-22 18:18:56.000000000 +0100
+++ /var/tmp/diff_new_pack.VLuxXi/_new 2013-01-22 18:18:56.000000000 +0100
@@ -28,9 +28,7 @@
%define exo_version %(rpm -q --queryformat '%%{VERSION}' exo-data)
%define xfwm4_version %(rpm -q --queryformat '%%{VERSION}' xfwm4)
%define thunar_volman_version %(rpm -q --queryformat '%%{VERSION}'
thunar-volman)
-%if 0%{?suse_version} > 1140
%define midori_version %(rpm -q --queryformat '%%{VERSION}' midori)
-%endif
Name: xfce4-branding-openSUSE
Version: 4.10.0
@@ -39,24 +37,16 @@
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
Url: http://www.opensuse.org/
-%if 0%{?suse_version} < 1210
-Source0: %{name}_11.4-%{version}.tar.bz2
-%else
Source0: %{name}-%{version}.tar.bz2
-%endif
Source1: openSUSE-xfce-icon-theme.tar.bz2
BuildRequires: %{libxfce4ui_libname}
BuildRequires: exo-data
BuildRequires: fdupes
BuildRequires: libgarcon-data
-%if 0%{?suse_version} < 1210
-BuildRequires: desktop-data
-%else
BuildRequires: midori
# needed for %%{_sysconfdir}/xdg/midori/search
BuildRequires: midori-branding-upstream
BuildRequires: wallpaper-branding
-%endif
%if 0%{?suse_version} >= 1220
# owns %{_datadir}/xfce/applications/defaults.list symlink target
Requires: libgio-2_0-0
@@ -125,17 +115,12 @@
Summary: openSUSE Branding of xfce4-settings
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
-%if 0%{?suse_version} < 1210
-Requires: desktop-data
-Requires: gtk2-metatheme-sonar
-%else
Requires: desktop-data-openSUSE
Requires: gtk2-metatheme-adwaita
Requires: gtk3-metatheme-adwaita
Requires: openSUSE-xfce-icon-theme
# built from branding-openSUSE
Requires: xfce4-splash-branding-openSUSE
-%endif
Conflicts: otherproviders(xfce4-settings-branding)
Provides: xfce4-settings-branding = %{xfce4_settings_version}
Supplements: packageand(xfce4-settings:branding-openSUSE)
@@ -147,13 +132,8 @@
Summary: openSUSE Branding of xfdesktop
License: CC-BY-SA-3.0 and GPL-2.0+
Group: System/GUI/XFCE
-%if 0%{?suse_version} >= 1210
Requires: desktop-data-openSUSE
Requires: wallpaper-branding
-%else
-# should bring in either desktop-data-openSUSE or desktop-data-SLED
-Requires: desktop-data
-%endif
Conflicts: otherproviders(xfdesktop-branding)
Provides: xfce4-desktop-branding-openSUSE = %{xfdesktop_version}
Provides: xfdesktop-branding = %{xfdesktop_version}
@@ -167,13 +147,8 @@
Summary: openSUSE Branding of libgarcon
License: CC-BY-SA-3.0 and GPL-2.0
Group: System/GUI/XFCE
-%if 0%{?suse_version} >= 1210
Requires: desktop-data-openSUSE
Requires: wallpaper-branding
-%else
-# should bring in either desktop-data-openSUSE or desktop-data-SLED
-Requires: desktop-data
-%endif
# xfce-applications.menu requires xfce-settings-manager.menu
Requires: xfce4-settings-branding-openSUSE = %{version}
# the menu references xfce4-about.desktop
@@ -241,7 +216,6 @@
%description -n thunar-volman-branding-openSUSE
This package provides the openSUSE look and feel for the Thunar Volume Manager.
-%if 0%{?suse_version} > 1140
%package -n midori-branding-openSUSE
Summary: openSUSE Branding of midori
License: CC-BY-SA-3.0 and GPL-2.0+
@@ -252,13 +226,11 @@
%description -n midori-branding-openSUSE
This package provides the openSUSE look and feel for the Midori web browser.
-%endif
%prep
%setup -q -a1
%build
-%if 0%{?suse_version} > 1140
cp %{_sysconfdir}/xdg/midori/search etc/xdg/midori/search
cat >>etc/xdg/midori/search <<'EOF'
@@ -268,7 +240,6 @@
uri=http://software.opensuse.org/search?p=1&baseproject=ALL&q=%%s
token=os
EOF
-%endif
%install
find etc usr -depth -print | cpio -pvd %{buildroot}
@@ -336,11 +307,6 @@
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
%dir %{_sysconfdir}/xdg/menus
%config %{_sysconfdir}/xdg/menus/xfce-settings-manager.menu
-# provided by xfce4-splash-branding-openSUSE for >= 12.1
-%if 0%{?suse_version} < 1210
-%doc COPYING.xfce4-splash-openSUSE
-%{_datadir}/pixmaps/xfce4-splash-openSUSE.png
-%endif
%files -n xfdesktop-branding-openSUSE
%defattr(-,root,root)
@@ -392,13 +358,11 @@
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
-%if 0%{?suse_version} > 1140
%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
-%endif
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
