diff --git a/.gitignore b/.gitignore index e5f2310..94547f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ uniconvertor-1.1.4.tar.gz /uniconvertor-2.0svn340.tar.xz +/uniconvertor-2.0svn344.tar.xz diff --git a/sources b/sources index 14a0140..0eb01bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cdb9a873f40be14fa13a086e552cc40e uniconvertor-2.0svn340.tar.xz +60123d1562ec2953f1aab696786d1b53 uniconvertor-2.0svn344.tar.xz diff --git a/uniconvertor.get.tarball.svn b/uniconvertor.get.tarball.svn index 1075966..0d9504d 100755 --- a/uniconvertor.get.tarball.svn +++ b/uniconvertor.get.tarball.svn @@ -9,6 +9,9 @@ rm -rf $APP-$VER REV=$( svn checkout http://uniconvertor.googlecode.com/svn/trunk/ $APP-$VER | tail -n 1 | grep -Po '\d+' ) echo REV=$REV +# Non-free sRGB.icm removal +rm -rf $APP-$VER/src/unittests/cms_tests/cms_data/sRGB.icm + TARF=$APP-${VER}svn${REV}.tar.xz tar -cJf $TARF $APP-$VER echo "[$TARF] created" diff --git a/uniconvertor.spec b/uniconvertor.spec index b3aaee2..0ae6325 100644 --- a/uniconvertor.spec +++ b/uniconvertor.spec @@ -1,10 +1,10 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%global SVN 340 +%global SVN 344 Name: uniconvertor Version: 2.0 -Release: 0.1%{?SVN:.svn%{SVN}}%{?dist} +Release: 0.2%{?SVN:.svn%{SVN}}%{?dist} Summary: Universal vector graphics translator Group: Applications/Multimedia @@ -15,6 +15,8 @@ Source1: %{name}.get.tarball.svn Source0: %{name}-%{version}svn%{SVN}.tar.xz BuildRequires: python-devel, pycairo-devel, python-pillow-devel, lcms2-devel +# For a public domain sRGB.icm +BuildRequires: argyllcms Requires: python-imaging, python-reportlab, python-pillow @@ -24,6 +26,7 @@ It uses sK1 engine to convert one format to another. %prep %setup -q +cp -a /usr/share/color/argyll/ref/sRGB.icm src/unittests/cms_tests/cms_data/sRGB.icm %build CFLAGS="$RPM_OPT_FLAGS -I/usr/include/python2.7/Imaging" python setup.py build @@ -40,6 +43,11 @@ python setup.py install --skip-build --root %{buildroot} %{_datarootdir}/mime/packages/vnd.sk1project.pdxf-graphics.xml %changelog +* Tue Sep 3 2013 Tom Callaway - 2.0-0.2.svn344 +- fix tarball generation script to remove non-free sRGB.icm +- update to cleaned svn344 tarball +- use Public Domain sRGB.icm from argyllcms + * Sat Aug 24 2013 Pavel Alexeev - 2.0-0.1.svn340 - First attempt packaging 2.0 version. Igor Novikov said in mail it is almost ready. - New build with hope to fix compatability with python-pillow instead of PIL (by author mail)