Hello community,
here is the log from the commit of package yast2-theme
checked in at Tue Jul 10 18:42:06 CEST 2007.
--------
--- yast2-theme/yast2-theme.changes 2007-06-16 00:22:30.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-theme/yast2-theme.changes 2007-07-09 09:08:54.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jul 3 15:57:47 CEST 2007 - locilka@suse.cz
+
+- Created identical copy of yast2-theme-openSUSE under the name
+ yast2-theme-openSUSE-Crystal (FATE #301304). The old theme will
+ use Tango and the new one Crystal iconsets.
+- Initially NLD-theme was used for yast2-theme-openSUSE.
+- V 2.15.4
+
+-------------------------------------------------------------------
@@ -10 +19 @@
- (needed for hack in yast2-sudo working around 253001)
+ (needed for hack in yast2-sudo working around 253001)
Old:
----
yast2-theme-2.15.3.tar.bz2
New:
----
yast2-theme-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-theme.spec ++++++
--- /var/tmp/diff_new_pack.qO3611/_old 2007-07-10 18:41:15.000000000 +0200
+++ /var/tmp/diff_new_pack.qO3611/_new 2007-07-10 18:41:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-theme (Version 2.15.3)
+# spec file for package yast2-theme (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,14 @@
# norootforbuild
Name: yast2-theme
-Version: 2.15.3
-Release: 3
-License: GNU General Public License (GPL)
+Version: 2.15.4
+Release: 1
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-theme-2.15.3.tar.bz2
+Source0: yast2-theme-2.15.4.tar.bz2
prefix: /usr
-BuildRequires: pkg-config update-desktop-files yast2 yast2-core yast2-devtools
-%if %{?suse_version} > 1020
-BuildRequires: fdupes
-%endif
+BuildRequires: hicolor-icon-theme pkg-config update-desktop-files yast2 yast2-core yast2-devtools
BuildArchitectures: noarch
Summary: YaST2 - Theme
@@ -36,14 +33,28 @@
%package openSUSE
Summary: YaST2 - Theme (openSUSE)
-Version: 2.15.3
-Release: 33
+Version: 2.15.4
+Release: 1
Group: System/YaST
Provides: yast2_theme = %{version}
Provides: yast2-theme-UnitedLinux
PreReq: /bin/ln
+Requires: hicolor-icon-theme
Obsoletes: yast2-theme-SuSELinux
Obsoletes: yast2-theme-UnitedLinux
+Conflicts: yast2-theme-openSUSE-Crystal
+%package openSUSE-Crystal
+Summary: YaST2 - Theme (openSUSE)
+Version: 2.15.4
+Release: 1
+Group: System/YaST
+Provides: yast2_theme = %{version}
+Provides: yast2-theme-UnitedLinux
+PreReq: /bin/ln
+Requires: hicolor-icon-theme
+Obsoletes: yast2-theme-SuSELinux
+Obsoletes: yast2-theme-UnitedLinux
+Conflicts: yast2-theme-openSUSE
%description openSUSE
This package contains the openSUSE theme for YaST2.
@@ -54,8 +65,18 @@
--------
Ken Wimer
+
+%description openSUSE-Crystal
+This package contains the openSUSE theme for YaST2.
+
+
+
+Authors:
+--------
+ Ken Wimer
+
%prep
-%setup -n yast2-theme-2.15.3
+%setup -n yast2-theme-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,52 +96,71 @@
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
cp -R "$RPM_BUILD_ROOT/%{prefix}/share/doc/packages/yast2-theme" "$RPM_BUILD_ROOT/%{prefix}/share/doc/packages/yast2-theme-openSUSE"
+cp -R "$RPM_BUILD_ROOT/%{prefix}/share/doc/packages/yast2-theme" "$RPM_BUILD_ROOT/%{prefix}/share/doc/packages/yast2-theme-openSUSE-Crystal"
rm -rf "$RPM_BUILD_ROOT/%{prefix}/share/doc/packages/yast2-theme"
+# ghost file (not packed in RPM but listed)
+cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/
+rm -rf current
+ln -sn openSUSE current
#
# make icons available to GNOME control center (hicolor theme)
# (bug #166008)
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
-cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/openSUSE/icons
+cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/current/icons
for dir in 22x22 32x32 48x48; do
- cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/openSUSE/icons/$dir/apps
+ cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/current/icons/$dir/apps
icons=$(ls *.png)
cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps
for icon in $icons; do
- ln -s ../../../../YaST2/theme/openSUSE/icons/$dir/apps/$icon .
+ ln -s ../../../../YaST2/theme/current/icons/$dir/apps/$icon .
done
done
-%if %{?suse_version} > 1020
- %fdupes $RPM_BUILD_ROOT
-%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT//usr/share/YaST2/theme
%post openSUSE
cd /usr/share/YaST2/theme
ln -snf openSUSE current
+%post openSUSE-Crystal
+cd /usr/share/YaST2/theme
+ln -snf openSUSE-Crystal current
+
%files openSUSE
%defattr(-,root,root)
%dir /usr/share/YaST2/theme
-%dir /usr/share/YaST2/theme/openSUSE
-%dir /usr/share/icons/hicolor
-%dir /usr/share/icons/hicolor/22x22
-%dir /usr/share/icons/hicolor/22x22/apps
-%dir /usr/share/icons/hicolor/32x32
-%dir /usr/share/icons/hicolor/32x32/apps
-%dir /usr/share/icons/hicolor/48x48
-%dir /usr/share/icons/hicolor/48x48/apps
-/usr/share/YaST2/theme/openSUSE/*
+/usr/share/YaST2/theme/openSUSE
/usr/share/icons/hicolor/22x22/apps/*
/usr/share/icons/hicolor/32x32/apps/*
/usr/share/icons/hicolor/48x48/apps/*
-/usr/share/YaST2/theme/openSUSE/testpage/*
%doc %{prefix}/share/doc/packages/yast2-theme-openSUSE
+# ghost file (not packed in RPM but listed)
+# remove the file when removing the RPM
+%ghost /usr/share/YaST2/theme/current
+
+%files openSUSE-Crystal
+%defattr(-,root,root)
+%dir /usr/share/YaST2/theme
+/usr/share/YaST2/theme/openSUSE-Crystal
+/usr/share/icons/hicolor/22x22/apps/*
+/usr/share/icons/hicolor/32x32/apps/*
+/usr/share/icons/hicolor/48x48/apps/*
+%doc %{prefix}/share/doc/packages/yast2-theme-openSUSE-Crystal
+# ghost file (not packed in RPM but listed)
+# remove the file when removing the RPM
+%ghost /usr/share/YaST2/theme/current
%changelog
+* Tue Jul 03 2007 - locilka@suse.cz
+- Created identical copy of yast2-theme-openSUSE under the name
+ yast2-theme-openSUSE-Crystal (FATE #301304). The old theme will
+ use Tango and the new one Crystal iconsets.
+- Initially NLD-theme was used for yast2-theme-openSUSE.
+- V 2.15.4
* Sat Jun 16 2007 - dmueller@suse.de
- hardlink theme files that are duplicate
* Mon Apr 30 2007 - ro@suse.de
++++++ yast2-theme-2.15.3.tar.bz2 -> yast2-theme-2.15.4.tar.bz2 ++++++
++++ 13483 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org