Accepting request 570917 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/570917
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcaca?expand=0&rev=40

_service

@@ -1,15 +0,0 @@
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="version">0.99.beta19</param>
-    <param name="versionformat">0.99.beta19+git%cd.%h</param>
-    <param name="url">https://github.com/cacalabs/libcaca.git</param>
-    <param name="scm">git</param>
-    <param name="exclude">.git</param>
-    <param name="changesgenerate">enable</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="compression">xz</param>
-    <param name="file">*.tar</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>

libcaca-0.99.beta19+git20171002.da28e96.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb6966533f1e3c8762f5b5b8cd579921263c022e5817e9d61f517bdbd9dae2eb
-size 629280

libcaca-0.99.beta19.git20171003.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd18349a099a90af5f06a665236d586b9c67f64b3947549ba40ad42ec57c2e16
+size 879036

libcaca.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jan 30 11:03:56 UTC 2018 - davejplater@gmail.com
+
+- Deleted _service and use spec file to download git version.
+- Shorten version field to joliet usable length.
+- Change python headers to allow bindings to build normally with
+  python3.
+- Use %license for license document.
+
 -------------------------------------------------------------------
 Tue Jan 23 18:32:31 UTC 2018 - tchvatal@suse.com
 

libcaca.spec

@@ -16,16 +16,17 @@
 #
 
 
+#
+%define _rev da28e9684ef445ac8d42745644336b8a75c01855
+
 Name:           libcaca
-Version:        0.99.beta19+git20171002.da28e96
+Version:        0.99.beta19.git20171003
 Release:        0
 Summary:        Library for Colour ASCII Art, text mode graphics
 License:        WTFPL
 Group:          Development/Languages/C and C++
 Url:            http://caca.zoy.org/
-# Git: https://github.com/cacalabs/libcaca
+Source0:        https://github.com/cacalabs/%{name}/archive/%{_rev}.tar.gz#/%{name}-%{version}.tar.gz
-#Source0:        http://caca.zoy.org/files/libcaca/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch1:         libcaca-0.99-texbuild.patch
 Patch2:         libcaca-X11_test.patch
@@ -127,7 +128,7 @@ that shows the libcaca rendering features such as line and ellipses
 drawing, triangle filling and sprite blitting.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_rev}
 %patch2
 %patch4
 %patch5
@@ -137,6 +138,10 @@ drawing, triangle filling and sprite blitting.
 %patch10 -p1
 RUBY="ruby-`echo %{rb_ver} | sed 's|\.[^\.]*$||'`"
 find . -type f -exec sed -i "s|ruby-1.9|$RUBY|" \{\} \;
+pushd python
+#Change python script headers to python3
+for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
+popd
 
 %build
 autoreconf -fvi
@@ -155,25 +160,15 @@ export CXXFLAGS="$CXXFLAGS %{optflags}"
     --enable-conio=no \
     --enable-plugins \
     --enable-java=no \
-    --enable-python=no
+    --enable-python
 make %{?_smp_mflags} V=1
 
-pushd python
-export LD_LIBRARY_PATH=$PWD/../caca/.libs/:$LD_LIBRARY_PATH
-export LANG=en_US.UTF-8
-python3 setup.py build
-popd
-
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-pushd python
-export LD_LIBRARY_PATH=$PWD/../caca/.libs/:$LD_LIBRARY_PATH
-export LANG=en_US.UTF-8
-python3 setup.py install -O1 --skip-build --force --root %{buildroot} --prefix %{_prefix}
-popd
 %fdupes -s %{buildroot}%{_mandir}/
+%fdupes -s %{buildroot}%{python3_sitelib}
 
 %post -n libcaca0 -p /sbin/ldconfig
 %postun -n libcaca0 -p /sbin/ldconfig
@@ -181,7 +176,8 @@ popd
 %postun -n libcaca0-plugins -p /sbin/ldconfig
 
 %files -n libcaca0
-%doc AUTHORS ChangeLog COPYING NEWS NOTES README THANKS
+%doc AUTHORS ChangeLog NEWS NOTES README THANKS
+%license COPYING
 %{_libdir}/*.so.*
 
 %files devel