Merge pull request #2 from gabi2/master

merge SLES and SLED branding package to yast2-branding-SLE

package/yast2-branding-SLE.changes

@@ -0,0 +1,7 @@
+-------------------------------------------------------------------
+Tue Jul  1 14:53:02 CEST 2014 - gs@suse.de
+
+- initial package
+- merge yast2-branding-SLES and yast2-branding-SLED to
+  yast2-branding-SLE (bnc #883485)
+- 3.1.0

package/yast2-branding-SLED.spec → package/yast2-branding-SLE.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-branding-SLED
+# spec file for package yast2-branding-SLE
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -16,7 +16,7 @@
 #
 
 
-Name:           yast2-branding-SLED
+Name:           yast2-branding-SLE
 Version:        3.1.0
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -25,31 +25,33 @@ Prefix:         /usr
 BuildRequires:  yast2-devtools
 BuildArch:      noarch
 Provides:       yast2-branding
-Supplements:    packageand(yast2:branding-SLED)
+Provides:       yast2-branding-SLES = 3.1.0, yast2-branding-SLED = 3.1.0
+Obsoletes:      yast2-branding-SLES <= 3.1.0, yast2-branding-SLED <= 3.1.0
 Conflicts:      otherproviders(yast2-branding)
 Requires:       yast2-theme-SLE
-Summary:        YaST2 - SLED Branding
+Supplements:    packageand(yast2:branding-SLE)
+Summary:        SLE branding for YaST
 License:        GPL-2.0+
 Group:          System/YaST
 
 %description
-YaST2 branding for the SUSE LINUX Enterprise Desktop distribution
+YaST branding for the SUSE LINUX Enterprise Server and Desktop distribution
 
 
 
 %prep
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/packages/yast2-branding-SLED
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/packages/yast2-branding-SLE
 mkdir -p $RPM_BUILD_ROOT%{prefix}/share/YaST2/theme
-cp $RPM_SOURCE_DIR/COPYING $RPM_BUILD_ROOT%{prefix}/share/doc/packages/yast2-branding-SLED
+cp $RPM_SOURCE_DIR/COPYING $RPM_BUILD_ROOT%{prefix}/share/doc/packages/yast2-branding-SLE
 cd $RPM_BUILD_ROOT%{prefix}/share/YaST2/theme
 ln -sf SLE current
 
 %files
 %defattr(644,root,root,755)
 %dir %{prefix}/share/YaST2/theme
-%{prefix}/share/doc/packages/yast2-branding-SLED/
+%{prefix}/share/doc/packages/yast2-branding-SLE/
 %{prefix}/share/YaST2/theme/current
 
 %changelog