Hello community,
here is the log from the commit of package yast2-theme
checked in at Fri Sep 12 02:00:08 CEST 2008.
--------
--- yast2-theme/yast2-theme.changes 2008-08-25 00:21:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-theme/yast2-theme.changes 2008-09-11 15:43:06.224320000 +0200
@@ -2 +2 @@
-Mon Aug 25 00:21:26 CEST 2008 - ro@suse.de
+Thu Sep 11 15:36:58 CEST 2008 - jsrain@suse.cz
@@ -4 +4,2 @@
-- avoid conflict between theme packages
+- adapted to existence of yast2-branding packages (fate #301794)
+- 2.17.3
Old:
----
yast2-theme-2.17.2.tar.bz2
New:
----
yast2-theme-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-theme.spec ++++++
--- /var/tmp/diff_new_pack.T16218/_old 2008-09-12 01:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.T16218/_new 2008-09-12 01:58:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-theme (Version 2.17.2)
+# spec file for package yast2-theme (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,14 +19,14 @@
Name: yast2-theme
-Version: 2.17.2
-Release: 2
+Version: 2.17.3
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-theme-2.17.2.tar.bz2
+Source0: yast2-theme-2.17.3.tar.bz2
Prefix: /usr
-BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2 yast2-devtools
+BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2-devtools
BuildArch: noarch
Summary: YaST2 - Theme
@@ -42,11 +42,12 @@
%package openSUSE
License: GPL v2 or later
Summary: YaST2 - Theme (openSUSE)
-Version: 2.17.2
-Release: 2
+Version: 2.17.3
+Release: 1
Group: System/YaST
Provides: yast2_theme = %{version}
Provides: yast2-theme-UnitedLinux
+Provides: yast2-theme-openSUSE-any
PreReq: /bin/ln
Requires: hicolor-icon-theme
Obsoletes: yast2-theme-SuSELinux
@@ -57,19 +58,21 @@
%package openSUSE-Crystal
License: GPL v2 or later
Summary: YaST2 - Theme (openSUSE)
-Version: 2.17.2
-Release: 2
+Version: 2.17.3
+Release: 1
Group: System/YaST
Provides: yast2_theme = %{version}
+Provides: yast2-theme-openSUSE-any
PreReq: /bin/ln yast2-theme-openSUSE
%package openSUSE-Oxygen
License: GPL v2 or later
Summary: YaST2 - Theme (openSUSE)
-Version: 2.17.2
-Release: 2
+Version: 2.17.3
+Release: 1
Group: System/YaST
Provides: yast2_theme = %{version}
+Provides: yast2-theme-openSUSE-any
PreReq: /bin/ln yast2-theme-openSUSE
Conflicts: yast2-theme-openSUSE-Crystal
@@ -101,7 +104,7 @@
Ken Wimer
%prep
-%setup -n yast2-theme-2.17.2
+%setup -n yast2-theme-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -124,8 +127,8 @@
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
+rm -rf openSUSE-current
+ln -sn openSUSE openSUSE-current
#
# make icons available to GNOME control center (hicolor theme)
# (bug #166008)
@@ -133,13 +136,13 @@
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps
-cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/current/icons
+cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/openSUSE-current/icons
for dir in 22x22 32x32 48x48 64x64; do
- cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/current/icons/$dir/apps
+ cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/openSUSE-current/icons/$dir/apps
icons=$(ls *.png)
cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps
for icon in $icons; do
- ln -s /usr/share/YaST2/theme/current/icons/$dir/apps/$icon .
+ ln -s /usr/share/YaST2/theme/openSUSE-current/icons/$dir/apps/$icon .
done
done
filelist=$(mktemp /tmp/fileListXXXXXX)
@@ -155,10 +158,6 @@
done
done
%fdupes $RPM_BUILD_ROOT//usr/share/YaST2/theme
-# set current as a self pointing link to avoid conflict
-export NO_BRP_STALE_LINK_ERROR="yes"
-rm -f $RPM_BUILD_ROOT/usr/share/YaST2/theme/current
-ln -sf current $RPM_BUILD_ROOT/usr/share/YaST2/theme/current
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -167,16 +166,16 @@
%post openSUSE
cd /usr/share/YaST2/theme
if ! test -d openSUSE-Crystal && ! test -d openSUSE-Oxygen; then
- ln -snf openSUSE current
+ ln -snf openSUSE openSUSE-current
fi
%post openSUSE-Crystal
cd /usr/share/YaST2/theme
-ln -snf openSUSE-Crystal current
+ln -snf openSUSE-Crystal openSUSE-current
%post openSUSE-Oxygen
cd /usr/share/YaST2/theme
-ln -snf openSUSE-Oxygen current
+ln -snf openSUSE-Oxygen openSUSE-current
%files openSUSE
%defattr(-,root,root)
@@ -186,7 +185,7 @@
%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
+%ghost /usr/share/YaST2/theme/openSUSE-current
%files openSUSE-Crystal
%defattr(-,root,root)
@@ -197,10 +196,10 @@
%defattr(-,root,root)
%dir /usr/share/YaST2/theme
/usr/share/YaST2/theme/openSUSE-Oxygen
-
%changelog
-* Mon Aug 25 2008 ro@suse.de
-- avoid conflict between theme packages
+* Thu Sep 11 2008 jsrain@suse.cz
+- adapted to existence of yast2-branding packages (fate #301794)
+- 2.17.3
* Fri Aug 22 2008 sschober@suse.de
- added missing 22x22 yast2 group icons
- 2.17.2
++++++ yast2-theme-2.17.2.tar.bz2 -> yast2-theme-2.17.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.17.2/configure new/yast2-theme-2.17.3/configure
--- old/yast2-theme-2.17.2/configure 2008-08-22 11:17:12.000000000 +0200
+++ new/yast2-theme-2.17.3/configure 2008-09-11 15:42:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-theme 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-theme 2.17.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-theme'
PACKAGE_TARNAME='yast2-theme'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-theme 2.17.2'
+PACKAGE_VERSION='2.17.3'
+PACKAGE_STRING='yast2-theme 2.17.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1194,7 +1194,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-theme 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-theme 2.17.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1265,7 +1265,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-theme 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-theme 2.17.3:";;
esac
cat <<\_ACEOF
@@ -1343,7 +1343,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-theme configure 2.17.2
+yast2-theme configure 2.17.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1357,7 +1357,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-theme $as_me 2.17.2, which was
+It was created by yast2-theme $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2178,7 +2178,7 @@
# Define the identity of the package.
PACKAGE='yast2-theme'
- VERSION='2.17.2'
+ VERSION='2.17.3'
cat >>confdefs.h <<_ACEOF
@@ -2406,7 +2406,7 @@
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-theme"
MAINTAINER="Stefan Hundhammer "
@@ -3130,7 +3130,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-theme $as_me 2.17.2, which was
+This file was extended by yast2-theme $as_me 2.17.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3173,7 +3173,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-theme config.status 2.17.2
+yast2-theme config.status 2.17.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.17.2/configure.in new/yast2-theme-2.17.3/configure.in
--- old/yast2-theme-2.17.2/configure.in 2008-08-22 11:17:05.000000000 +0200
+++ new/yast2-theme-2.17.3/configure.in 2008-09-11 15:42:31.000000000 +0200
@@ -2,7 +2,7 @@
dnl
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-theme, 2.17.2, http://bugs.opensuse.org/, yast2-theme)
+AC_INIT(yast2-theme, 2.17.3, http://bugs.opensuse.org/, yast2-theme)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-theme"
MAINTAINER="Stefan Hundhammer "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-theme-2.17.2/VERSION new/yast2-theme-2.17.3/VERSION
--- old/yast2-theme-2.17.2/VERSION 2008-08-22 11:15:58.000000000 +0200
+++ new/yast2-theme-2.17.3/VERSION 2008-09-11 15:40:00.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org