Hello community, here is the log from the commit of package openclipart for openSUSE:Factory checked in at 2014-01-29 07:16:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openclipart (Old) and /work/SRC/openSUSE:Factory/.openclipart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openclipart" Changes: -------- --- /work/SRC/openSUSE:Factory/openclipart/openclipart.changes 2011-09-23 02:15:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openclipart.new/openclipart.changes 2014-01-29 07:16:31.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Jan 27 19:33:22 UTC 2014 - [email protected] + +- Version bump to 0.20: + * adds more images +- Pack everything: + * there might be broken files but filtering is huge pain and + it should be rather delt with on upstream side. +- Compress svg files as there is no reason to have them unpacked +- Use fdupes to reduce size + +------------------------------------------------------------------- Old: ---- clean-up-sources.sh generate-png-source.sh generate-png-source.sh.log.bz2 openclipart-0.18-pngonly.tar.bz2 openclipart-0.18-svgonly.tar.bz2 New: ---- openclipart-2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openclipart.spec ++++++ --- /var/tmp/diff_new_pack.M5PWFb/_old 2014-01-29 07:16:40.000000000 +0100 +++ /var/tmp/diff_new_pack.M5PWFb/_new 2014-01-29 07:16:40.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package openclipart (Version 0.18) +# spec file for package openclipart # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,42 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - +%define _tarver 2.0 Name: openclipart +Version: 0.20 +Release: 0 +Summary: Open Clip Art Library License: SUSE-Public-Domain Group: Productivity/Graphics/Other -AutoReqProv: on -Summary: Open Clip Art Library -Version: 0.18 -Release: 137 Url: http://www.openclipart.org/ -# This tarball has been generated using: -# sh generate-png-source.sh openclipart-0.18-svgonly.tar.bz2 2>&1 | tee generate-png-source.sh.log -Source0: openclipart-%{version}-pngonly.tar.bz2 -Source1: openclipart-%{version}-svgonly.tar.bz2 -Source2: generate-png-source.sh -Source3: generate-png-source.sh.log.bz2 -Source4: clean-up-sources.sh +Source0: ftp://ftp.osuosl.org/pub/openclipart/downloads/%{_tarver}/%{name}-%{_tarver}.tar.bz2 +BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description An extensive set of clip art graphics that can be used for free. - - %package svg -License: SUSE-Public-Domain Summary: Open Clip Art Library in the SVG File Format +License: SUSE-Public-Domain Group: Productivity/Graphics/Other -%if 0%{?suse_version} >= 01020 || 0%{?meego_version} -# FIXME: http://en.opensuse.org/Packaging/Distribution_differences claims that Requires(posttrans) is not implemented -Requires(post): coreutils -%else -PreReq: coreutils -%endif %description svg An extensive set of clip art graphics that can be used for free. @@ -58,21 +42,12 @@ This package includes the pictures in the original SVG graphics file format. - - %package png -License: SUSE-Public-Domain Summary: Open Clip Art Library in the PNG File Format +License: SUSE-Public-Domain Group: Productivity/Graphics/Other -Provides: openclipart:/usr/share/clipart/openclipart-0.18/animals/birds/baby_tux_01.png -Provides: openclipart <= 0.18 -Obsoletes: openclipart <= 0.18 -%if 0%{?suse_version} >= 01020 || 0%{?meego_version} -# FIXME: http://en.opensuse.org/Packaging/Distribution_differences claims that Requires(posttrans) is not implemented -Requires(post): coreutils -%else -PreReq: coreutils -%endif +Provides: openclipart = %{version} +Obsoletes: openclipart < %{version} %description png An extensive set of clip art graphics that can be used for free. @@ -80,56 +55,35 @@ This package includes the pictures converted to the PNG graphics file format. - - %prep -%setup -q -n openclipart-%{version}-pngonly -b 1 -# -install -m 755 %{S:2} %{S:4} . -bzip2 -dc %{S:3} >generate-png-source.sh.log +%setup -q -c +# tarball is packed really poorly +find ./ -type d |xargs -i chmod +x {} +mv %{name}-%{version}/* ./ +rm -rf %{name}-%{version}/ %build +# Compress all the svg images as it is possible and eats up less space +echo "Compressing SVG files..." +find -name "*.svg" -print0 | xargs -L 1 -0 \ + bash -c 'gzip -9c "${1}" > "${1}z"; rm -f "${1}"' -- +# Remove pngz as they are not actually that smaller anyway +find -name "*.pngz" | xargs -i rm {} %install -install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/clipart/%name-%version -cp -a ../openclipart-%{version}-pngonly/clipart/* \ - $RPM_BUILD_ROOT%{_datadir}/clipart/%name-%version -cp -a ../openclipart-%{version}-svgonly/clipart/* \ - $RPM_BUILD_ROOT%{_datadir}/clipart/%name-%version -find $RPM_BUILD_ROOT%{_datadir}/clipart/%name-%version -mindepth 1 -maxdepth 1 -type f -exec rm {} \; -rm -rf $RPM_BUILD_ROOT%{_datadir}/clipart/%name-%version/nsis -# -# do clean up ... -DESTDIR=$RPM_BUILD_ROOT ./clean-up-sources.sh %{_datadir}/clipart/%name-%version/ -# -# compat symlink without version -ln -sf %name-%version $RPM_BUILD_ROOT%{_datadir}/clipart/%name -# +mkdir -p %{buildroot}%{_datadir}/clipart/%{name}/ +cp -r . %{buildroot}%{_datadir}/clipart/%{name}/ # file lists -for suffix in png svg ; do - find $RPM_BUILD_ROOT%{_datadir}/clipart -type d | sed "s|^$RPM_BUILD_ROOT\(.*\)$|%dir \"\1\"|" >files.$suffix - find $RPM_BUILD_ROOT%{_datadir}/clipart -name "*.$suffix" | sed "s|^$RPM_BUILD_ROOT\(.*\)$|\"\1\"|" >>files.$suffix +for suffix in png svgz; do + find %{buildroot}%{_datadir}/clipart -type d | sed "s|^%{buildroot}\(.*\)$|%dir \"\1\"|" >files.$suffix + find %{buildroot}%{_datadir}/clipart -name "*.$suffix" | sed "s|^%{buildroot}\(.*\)$|\"\1\"|" >>files.$suffix done +%fdupes -s %{buildroot}%{_datadir}/clipart -%clean -rm -rf $RPM_BUILD_ROOT - -%posttrans svg -test -L %{_datadir}/clipart/%name && rm %{_datadir}/clipart/%name || true -test ! -e %{_datadir}/clipart/%name && ln -sf %name-%version %{_datadir}/clipart/%name || true; - -%posttrans png -test -L %{_datadir}/clipart/%name && rm %{_datadir}/clipart/%name || true -test ! -e %{_datadir}/clipart/%name && ln -sf %name-%version %{_datadir}/clipart/%name || true; - -%files -f files.svg svg +%files -f files.svgz svg %defattr(-, root,root) -%doc AUTHORS ChangeLog INSTALL LICENSE NEWS README VERSION clipart/{PASSFAIL,TODO} -%ghost %{_datadir}/clipart/%name %files -f files.png png %defattr(-, root,root) -%doc AUTHORS ChangeLog INSTALL LICENSE NEWS README VERSION generate-png-source.sh* clipart/{PASSFAIL,TODO} -%ghost %{_datadir}/clipart/%name %changelog ++++++ openclipart-0.18-pngonly.tar.bz2 -> openclipart-2.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/openclipart/openclipart-0.18-pngonly.tar.bz2 /work/SRC/openSUSE:Factory/.openclipart.new/openclipart-2.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
