- added -branding-upstream subpackage

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=18

libxfce4ui.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  5 15:07:41 UTC 2011 - gber@opensuse.org
+
+- added -branding-upstream subpackage
+
 -------------------------------------------------------------------
 Tue Jan  4 16:55:49 UTC 2011 - gber@opensuse.org
 

libxfce4ui.spec

@@ -32,6 +32,7 @@ BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(libstartup-notification-1.0)
 BuildRequires:  pkgconfig(libxfce4util-1.0)
 BuildRequires:  pkgconfig(libxfconf-0)
+Requires:       %{name}-branding >= %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -84,6 +85,20 @@ applications.
 
 This package provides the documentation for the libxfce4ui library.
 
+%package branding-upstream
+Summary:        Upstream branding of libxfce4ui
+License:        GPLv2+
+Group:          System/GUI/XFCE
+# BRAND: xfce4-keyboard-shortcuts.xml: Controls the global keyboard shortcuts
+# BRAND: for the Xfce desktop.
+Conflicts:      otherproviders(%{name}-branding)
+Provides:       %{name}-branding = %{version}
+Supplements:    packageand(%{name}:branding-upstream)
+BuildArch:      noarch
+
+%description branding-upstream
+This package provides the openSUSE look and feel for the libxfce4ui library.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -117,7 +132,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/xdg/xfce4
 %dir %{_sysconfdir}/xdg/xfce4/xfconf
 %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
-%exclude %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 %{_libdir}/lib*.so.*
 
 %files -n glade3-catalog-libxfce4ui
@@ -139,4 +153,11 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/libxfce4ui/
 
+%files branding-upstream
+%defattr(-, root, root)
+%dir %{_sysconfdir}/xdg/xfce4
+%dir %{_sysconfdir}/xdg/xfce4/xfconf
+%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
+%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+
 %changelog