Accepting request 1149995 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/1149995 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcaca?expand=0&rev=50
This commit is contained in:
commit
6bf5bd0826
@ -5,8 +5,8 @@
|
||||
|
||||
Index: src/cacaclock.c
|
||||
===================================================================
|
||||
--- src/cacaclock.c.orig
|
||||
+++ src/cacaclock.c
|
||||
--- libcaca/src/cacaclock.c
|
||||
+++ libcaca-new/src/cacaclock.c
|
||||
@@ -40,14 +40,14 @@ static void version(void)
|
||||
{
|
||||
printf(
|
||||
@ -26,8 +26,8 @@ Index: src/cacaclock.c
|
||||
|
||||
Index: src/img2txt.c
|
||||
===================================================================
|
||||
--- src/img2txt.c.orig
|
||||
+++ src/img2txt.c
|
||||
--- libcaca/src/img2txt.c
|
||||
+++ libcaca-new/src/img2txt.c
|
||||
@@ -67,14 +67,14 @@ static void version(void)
|
||||
{
|
||||
printf(
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: doc/doxygen.cfg.in
|
||||
===================================================================
|
||||
--- doc/doxygen.cfg.in.orig
|
||||
+++ doc/doxygen.cfg.in
|
||||
--- libcaca/doc/doxygen.cfg.in
|
||||
+++ libcaca-new/doc/doxygen.cfg.in
|
||||
@@ -1891,7 +1891,7 @@ USE_PDFLATEX = YES
|
||||
# The default value is: NO.
|
||||
# This tag requires that the tag GENERATE_LATEX is set to YES.
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: caca/Makefile.am
|
||||
===================================================================
|
||||
--- caca/Makefile.am.orig
|
||||
+++ caca/Makefile.am
|
||||
--- libcaca/caca/Makefile.am
|
||||
+++ libcaca-new/caca/Makefile.am
|
||||
@@ -58,7 +58,7 @@ libcaca_la_DEPENDENCIES = \
|
||||
$(NULL)
|
||||
libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
--- libcaca/configure.ac
|
||||
+++ libcaca-new/configure.ac
|
||||
@@ -225,7 +225,7 @@ if test "${enable_x11}" != "no"; then
|
||||
AC_CHECK_LIB(X11, XOpenDisplay,
|
||||
[ac_cv_my_have_x11="yes"
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: ruby/Makefile.am
|
||||
===================================================================
|
||||
--- ruby/Makefile.am.orig
|
||||
+++ ruby/Makefile.am
|
||||
--- libcaca/ruby/Makefile.am
|
||||
+++ libcaca-new/ruby/Makefile.am
|
||||
@@ -12,7 +12,7 @@ TESTS = test
|
||||
endif
|
||||
endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
--- libcaca/configure.ac
|
||||
+++ libcaca-new/configure.ac
|
||||
@@ -489,14 +489,17 @@ ac_cv_my_have_ruby_minitest="no"
|
||||
if test "${enable_ruby}" != "no"; then
|
||||
AC_PATH_PROG(RUBY, ruby, no)
|
||||
@ -27,8 +27,8 @@ Index: configure.ac
|
||||
[ac_cv_my_have_ruby="yes"
|
||||
Index: ruby/Makefile.am
|
||||
===================================================================
|
||||
--- ruby/Makefile.am.orig
|
||||
+++ ruby/Makefile.am
|
||||
--- libcaca/ruby/Makefile.am
|
||||
+++ libcaca-new/ruby/Makefile.am
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
include $(top_srcdir)/build/autotools/common.am
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 23 08:48:14 UTC 2024 - Valentin Lefebvre <valentin.lefebvre@suse.com>
|
||||
|
||||
- Use %autosetup, prepare for RPM 4.20.
|
||||
* Rewrote patches so that they are applied uniformly via %autosetup.
|
||||
* Correctly reorder the patches in specfile declaration.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 14 15:32:39 UTC 2022 - Valentin Lefebvre <valentin.lefebvre@suse.com>
|
||||
|
||||
|
37
libcaca.spec
37
libcaca.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libcaca
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,18 +25,18 @@ Group: Development/Languages/C and C++
|
||||
URL: http://caca.zoy.org
|
||||
Source0: https://github.com/cacalabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Patch1: libcaca-0.99-texbuild.patch
|
||||
Patch2: libcaca-X11_test.patch
|
||||
Patch4: libcaca-ruby_am_cflags.patch
|
||||
Patch5: libcaca-ruby_vendor_install.patch
|
||||
Patch7: libcaca-0.99.beta16-missing-GLU.patch
|
||||
Patch9: caca-no-build-date.patch
|
||||
Patch10: libcaca-ncurses6.patch
|
||||
Patch13: Bug1143286_libcaca_configure_ac_chg_for_lto.patch
|
||||
Patch99: bsc1184751-add-space-for-NUL-byte.patch
|
||||
Patch: libcaca-X11_test.patch
|
||||
Patch: libcaca-ruby_am_cflags.patch
|
||||
Patch: libcaca-ruby_vendor_install.patch
|
||||
Patch: libcaca-0.99.beta16-missing-GLU.patch
|
||||
Patch: caca-no-build-date.patch
|
||||
Patch: libcaca-0.99-texbuild.patch
|
||||
Patch: libcaca-ncurses6.patch
|
||||
Patch: Bug1143286_libcaca_configure_ac_chg_for_lto.patch
|
||||
Patch: bsc1184751-add-space-for-NUL-byte.patch
|
||||
# PATCH-FIX-UPSTREAM correctly-handle-zero-width-or-height-images.patch bsc#1197028
|
||||
Patch100: bsc1197028-correctly-handle-zero-width-or-height-images.patch
|
||||
Patch101: libcaca-autoconf-2.69.patch
|
||||
Patch: bsc1197028-correctly-handle-zero-width-or-height-images.patch
|
||||
Patch: libcaca-autoconf-2.69.patch
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: freeglut-devel
|
||||
@ -131,18 +131,7 @@ that shows the libcaca rendering features such as line and ellipses
|
||||
drawing, triangle filling and sprite blitting.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch2
|
||||
%patch4
|
||||
%patch5
|
||||
%patch7
|
||||
%patch9
|
||||
%patch1
|
||||
%patch10 -p1
|
||||
%patch13 -p1
|
||||
%patch99 -p1
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%autosetup -p1
|
||||
RUBY="ruby-`echo %{rb_ver} | sed 's|\.[^\.]*$||'`"
|
||||
find . -type f -exec sed -i "s|ruby-1.9|$RUBY|" \{\} \;
|
||||
pushd python
|
||||
|
Loading…
Reference in New Issue
Block a user