From 2f8c007c86503830f828f42e9f088ef1ce69daac67e1b309e68999071374c6c1 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 30 Jan 2018 11:43:14 +0000 Subject: [PATCH] Accepting request 570916 from home:plater 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. - Drop the py2 bindings they fail to build using rpm macros and somehow ingnore LD_LIBRARY_PATH, anyway provide py3 variant and stick with that - Switch to git repack service in order to get all the latest fixes * like python3 porting of the bindings - Update to version 0.99.beta19+git20171002.da28e96: * img2text.c: fix width arg case in example * ruby: require 'caca' instead of 'caca.so' * Only fail the check-copyright test if more than 10 files are affected. * Try to run Coverity from Travis CI. * Add some missing breaks (thanks coverity) * Fix header copyright. * Fix a bug into the autorepeat trigger. - Refresh patches: * libcaca-ruby_am_cflags.patch * libcaca-ruby_vendor_install.patch - Fix URL - Mention github repo containing more changes - Format with spec-cleaner - Remove support for older distros lets stick with latest only - Remove for years disabled mono and java integration code snippets - Use python macros to build python instead of waiting for autotools - Convert to pkgconfig style dependencies - Require imlib2-loaders in caca-utils package. All of the utilities fail to load any image without the dependency. - Add libcaca-ncurses6.patch: defined against a function name never worked, so set_escdelay was actually never used. With curses 6.0, though, ESCDELAY is no longer 'a variable', but a reference to a function, so we can't assign anything to it. We just assume that we always use a recent enough version of ncurses to have set_escdelay avaialble. - Build without Mono by default coolo says: "We don't want mono in Factory, if somebody needs it it should be set explicit (with_mono) per prjconf" - Update libcaca-ruby_vendor_install.patch: Use RbConfig::CONFIG instead of Config::Config to be compatible with ruby 2.2. - Update to version 0.99beta19 * No changelog available - Remove automake-1.12.patch; fixed on upstream release - Remove __DATE__ usage from cacaclock - Add baselibs.conf as source to make factory-auto bot happy - Cleanup buildRequires, remove use of xorg-x11-* - remove SUSE prefix from license - fix build with different versions of ruby - add buildconditional to build optionally without mono - license update: SUSE-WTFPL-2.0 SPDX format (choose from http://www.spdx.org/licenses or the list linked at license.opensuse.org) - fix build with automake-12.1 - Use autoreconf instead of ./bootstrap since (a) that works, (b) avoids the inflexible handcrafted automake version check - update to libcaca-0.99beta18 - new "cacaclock" utility - improved FIGlet support - improved Python and Ruby bindings - numerous improvements and bugfixes - fix build with ruby 1.9 and re-enable python support - add libtool as explicit buildrequire to avoid implicit dependency from prjconf - Add 32bit compatibility libraries - Fix libcaca-devel Requires: libcaca-plugins to correct Requires: libcaca0-plugins. - Update to libcaca-0.99beta17 - Removed patches: libcaca-no_slang_acsmap.patch for < 10.1 libcaca-no_man3_pages.patch - pending investigation remove_badwords.patch - waiting for confirmation about bad words libcaca-0.99.beta16-libtool.patch - libtool method changed. - Fixed patches : libcaca-ruby_am_cflags.patch, libcaca-ruby_vendor_install.patch, caca-no-build-date.patch and libcaca-0.99.beta16-missing-GLU.patch. - Upstream changes : (See Changelog for more) * Add triangle texture mapping to NEWS and update ChangeLog. * Disable set_dither_palette until we really use it. * Fix distribution of Java source. * Large source code cleanup, getting rid of spaces, tabs, and svn keywords. * Nicer make check output for our custom tests. * Add missing ruby/test file to the distributed tarball. * Update logo in the PHP bindings. * Replace the old caca texture with a copy of our new logo. * Add #undef __extern at the end of caca0.h. Thanks to Carlo Bramini for * fixing this in #48. * Only define CACA_ALIAS with gcc > 3 (instead of >= 3). Patch courtesy of * Carlo Bramini. Addresses #48. * Add brief documentation to figfont functions. * Split check-build into check-doygen, check-source and check-win32. * Document file functions and fix a few issues here and there. * Move some configuration stuff from build-kernel into configure.ac. * Activate colour toilet font support. * Don't fail the check-build test if documentation was not built. * Simpler and more accurate troff colour selection. * Always draw all background in troff output, on beginning of lines too * Fix the source code to reduce testsuite errors. * Always draw all background in troff output * Fix check-build verbosity. * Fix shrext_cmds usage in configure.ac. * Map colors to the ones known by groff, defining mines don't work * Improve a bit troff export * Fix libcaca.a linkage (was off by one argument), fill memory with 0xCACA. - disable pdf API reference documentation, it fails to build with newer doxygen and the html documentation should be enough for the package - Do not include build date in binaries - updated patches to apply with fuzz=0 - fix build, missing -lGLU - Update to version 0.99.beta16 - libcucul was merged back into libcaca for more clarity - internal FIGlet font support - use C99 types in public headers - runtime support for output drivers - BBcode export support - remove "la" files - added patch to remove badwords because of bnc#441358 - Build dynamic libraries, disable creation of static ones. - Compile with OpenGL support. - Install ruby bindings in vendorarch/vendorlib. - Fix file list. - Update to 0.99beta13: - device-dependent cursor support - event API rewrite - Ruby bindings - Massive C# bindings improvements - Python sample code - support for 90-degree canvas rotation - better behaviour when trying to output Unicode on an ASCII terminal - the built-in font now supports the Geometric Shapes, Halfwidth and Fullwidth Forms and Miscellaneous Symbols Unicode blocks - new rotozoom effect in cacademo - preliminary .NET bindings - blitting canvases now makes use of the canvas' handle coordinates - import functions can read streamed data - attribute to colorspace transformations - added katakana and hiragana glyphs to the built-in font - support for blink, bold, italics and underline attributes - fixed Imlib2 support in cacaview - fixed buffer overflows in the file importer - support for fullwidth Unicode characters - transparency support in the UTF-8 importer and exporter - ANSI importer now handles transparency and UTF-8 - various memory leaks were fixed - implemented cucul_getchar() and cucul_get_color() - handle transparency in the IRC export - new cropping and expanding filters - full Unicode support in the OpenGL driver - all demos except cacafire were merged into cacademo - added a compatibility layer for pre-1.x libcaca applications - libcaca functions use errno for error reporting - ANSI importer - cacadraw, an ANSI viewer that will evolve into an editor - Unicode input and output support for SLang and ncurses - license switched to WTFPL - libcaca was split into libcucul, a standalone text manipulation backend, and libcaca, the display and user input frontend - TrueColor (more than 16 colours) support - Floyd-Steinberg dithering - gamma correction - export functions for HTML, IRC, ANSI, SVG, PostScript, TGA... - builtin fonts for device-independent bitmap output - various text transformation routines (rotation, horizontal flip...) - OpenGL renderer - kernel mode to build libcaca programs into a bootable x86 kernel - cacaserver, a telnet server that can be hooked to libcaca applications - img2irc, an image to IRC conversion utility - use texlive for building - Add ncurses-devel BuildRequires. - Adapt to new X11 paths. - Fix BuildRequires. - Add X11 devel files to BuildRequires. - converted neededforbuild to BuildRequires - added missing manpage symlinks to filelist - Initial package. - undef clashing acs_map from slang.h - don't try to install non-existing man3 pages - install documentation to different directory OBS-URL: https://build.opensuse.org/request/show/570916 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=45 --- _service | 15 --------- ...aca-0.99.beta19+git20171002.da28e96.tar.xz | 3 -- libcaca-0.99.beta19.git20171003.tar.gz | 3 ++ libcaca.changes | 9 ++++++ libcaca.spec | 32 ++++++++----------- 5 files changed, 26 insertions(+), 36 deletions(-) delete mode 100644 _service delete mode 100644 libcaca-0.99.beta19+git20171002.da28e96.tar.xz create mode 100644 libcaca-0.99.beta19.git20171003.tar.gz diff --git a/_service b/_service deleted file mode 100644 index 689d8ac..0000000 --- a/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - 0.99.beta19 - 0.99.beta19+git%cd.%h - https://github.com/cacalabs/libcaca.git - git - .git - enable - - - xz - *.tar - - - diff --git a/libcaca-0.99.beta19+git20171002.da28e96.tar.xz b/libcaca-0.99.beta19+git20171002.da28e96.tar.xz deleted file mode 100644 index e7b0af5..0000000 --- a/libcaca-0.99.beta19+git20171002.da28e96.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb6966533f1e3c8762f5b5b8cd579921263c022e5817e9d61f517bdbd9dae2eb -size 629280 diff --git a/libcaca-0.99.beta19.git20171003.tar.gz b/libcaca-0.99.beta19.git20171003.tar.gz new file mode 100644 index 0000000..7a3f24b --- /dev/null +++ b/libcaca-0.99.beta19.git20171003.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd18349a099a90af5f06a665236d586b9c67f64b3947549ba40ad42ec57c2e16 +size 879036 diff --git a/libcaca.changes b/libcaca.changes index bcae986..f5940e1 100644 --- a/libcaca.changes +++ b/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 diff --git a/libcaca.spec b/libcaca.spec index fcf74ed..8233cd6 100644 --- a/libcaca.spec +++ b/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: http://caca.zoy.org/files/libcaca/%{name}-%{version}.tar.gz -Source0: %{name}-%{version}.tar.xz +Source0: https://github.com/cacalabs/%{name}/archive/%{_rev}.tar.gz#/%{name}-%{version}.tar.gz 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