Hello community, here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2013-10-11 09:05:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old) and /work/SRC/openSUSE:Factory/.yast2-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme.changes 2013-09-25 14:44:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme.changes 2013-10-11 09:05:58.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 26 17:39:00 UTC 2013 - [email protected] + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + +------------------------------------------------------------------- Old: ---- yast2-theme-3.0.1.tar.bz2 New: ---- yast2-theme-3.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.vElQNr/_old 2013-10-11 09:06:03.000000000 +0200 +++ /var/tmp/diff_new_pack.vElQNr/_new 2013-10-11 09:06:03.000000000 +0200 @@ -17,17 +17,17 @@ Name: yast2-theme -Version: 3.0.1 +Version: 3.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-theme-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: pkg-config BuildRequires: update-desktop-files -BuildRequires: yast2-devtools +BuildRequires: yast2-devtools >= 3.0.6 BuildRequires: yast2-qt-branding-openSUSE BuildArch: noarch Summary: YaST2 - Theme @@ -40,7 +40,7 @@ %package openSUSE Summary: YaST2 - Theme (openSUSE) Group: System/YaST -Version: 3.0.1 +Version: 3.1.0 Release: 0 Provides: yast2-theme-UnitedLinux Provides: yast2-theme-openSUSE-any @@ -51,7 +51,7 @@ %package openSUSE-Crystal Summary: YaST2 - Theme (openSUSE) Group: System/YaST -Version: 3.0.1 +Version: 3.1.0 Release: 0 Provides: yast2-theme-openSUSE-any Provides: yast2_theme = %{version} @@ -60,7 +60,7 @@ %package openSUSE-Oxygen Summary: YaST2 - Theme (openSUSE) Group: System/YaST -Version: 3.0.1 +Version: 3.1.0 Release: 0 Provides: yast2-theme-openSUSE-any Provides: yast2_theme = %{version} @@ -70,7 +70,7 @@ %package SLE Summary: YaST2 - SLE Theme Group: System/YaST -Version: 3.0.1 +Version: 3.1.0 Release: 0 Provides: yast2-theme-NLD = 0.4.5 Provides: yast2_theme = %{version} @@ -92,33 +92,18 @@ Family. %prep -%setup -n yast2-theme-%{version} +%setup -n %{name}-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} -# V=1: verbose build in case we used AM_SILENT_RULES(yes) -# so that RPM_OPT_FLAGS check works -make %{?jobs:-j%jobs} V=1 +%yast_build %install -make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done +%yast_install -cp -R "$RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/yast2-theme" "$RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/yast2-theme-openSUSE" -rm -rf "$RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/yast2-theme" +cp -R "$RPM_BUILD_ROOT/%{yast_docdir}" "$RPM_BUILD_ROOT/%{yast_docdir}-openSUSE" +rm -rf "$RPM_BUILD_ROOT/%{yast_docdir}" # ghost file (not packed in RPM but listed) -cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/ +cd $RPM_BUILD_ROOT/%{yast_themedir}/ rm -rf openSUSE-current ln -sn openSUSE openSUSE-current # @@ -130,73 +115,69 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps -cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/openSUSE-current/icons +cd $RPM_BUILD_ROOT/%{yast_themedir}/openSUSE-current/icons for dir in 22x22 32x32 48x48 64x64 256x256; do - cd $RPM_BUILD_ROOT//usr/share/YaST2/theme/openSUSE-current/icons/$dir/apps + cd $RPM_BUILD_ROOT/%{yast_themedir}/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/openSUSE-current/icons/$dir/apps/$icon . + ln -s %{yast_themedir}/openSUSE-current/icons/$dir/apps/$icon . done done filelist=$(mktemp /tmp/fileListXXXXXX) -cd $RPM_BUILD_ROOT/usr/share/YaST2/theme/openSUSE +cd $RPM_BUILD_ROOT%{yast_themedir}/openSUSE files=$(find . -type f) -tfiles=$(cd /usr/share/YaST2/theme/openSUSE && find wizard -type f) +tfiles=$(cd %{yast_themedir}/openSUSE && find wizard -type f) files="$files $tfiles" for subtheme in Crystal Oxygen ; do - cd $RPM_BUILD_ROOT/usr/share/YaST2/theme/openSUSE-$subtheme + cd $RPM_BUILD_ROOT%{yast_themedir}/openSUSE-$subtheme for file in $files; do mkdir -p $(dirname "$file") || true if ! test -f "$file"; then - ln -s /usr/share/YaST2/theme/openSUSE/$file $file + ln -s %{yast_themedir}/openSUSE/$file $file fi done done -%fdupes $RPM_BUILD_ROOT/usr/share/YaST2/theme - -%clean -rm -rf "$RPM_BUILD_ROOT" -rm -rf $RPM_BUILD_ROOT/usr/share/YaST2/theme +%fdupes $RPM_BUILD_ROOT%{yast_themedir} %post openSUSE -cd /usr/share/YaST2/theme +cd %{yast_themedir} if ! test -d openSUSE-Crystal && ! test -d openSUSE-Oxygen; then ln -snf openSUSE openSUSE-current fi %post openSUSE-Crystal -cd /usr/share/YaST2/theme +cd %{yast_themedir} ln -snf openSUSE-Crystal openSUSE-current %post openSUSE-Oxygen -cd /usr/share/YaST2/theme +cd %{yast_themedir} ln -snf openSUSE-Oxygen openSUSE-current %files openSUSE %defattr(-,root,root) -%dir /usr/share/YaST2/theme -/usr/share/YaST2/theme/openSUSE +%dir %{yast_themedir} +%{yast_themedir}/openSUSE /usr/share/icons/hicolor/*/apps/* -%doc %{_prefix}/share/doc/packages/yast2-theme-openSUSE +%doc %{yast_docdir}-openSUSE # ghost file (not packed in RPM but listed) # remove the file when removing the RPM -%ghost /usr/share/YaST2/theme/openSUSE-current +%ghost %{yast_themedir}/openSUSE-current %files openSUSE-Crystal %defattr(-,root,root) -%dir /usr/share/YaST2/theme -/usr/share/YaST2/theme/openSUSE-Crystal +%dir %{yast_themedir} +%{yast_themedir}/openSUSE-Crystal %files openSUSE-Oxygen %defattr(-,root,root) -%dir /usr/share/YaST2/theme -/usr/share/YaST2/theme/openSUSE-Oxygen +%dir %{yast_themedir} +%{yast_themedir}/openSUSE-Oxygen %files SLE %defattr(-,root,root) -%dir /usr/share/YaST2/theme -/usr/share/YaST2/theme/SLE +%dir %{yast_themedir} +%{yast_themedir}/SLE %changelog ++++++ yast2-theme-3.0.1.tar.bz2 -> yast2-theme-3.1.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-3.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-3.1.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
