packages: libcaca/libcaca.spec, libcaca/install.patch (NEW) - creating *cuc...

[sls]

Author: sls                          Date: Mon Oct 26 19:11:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- creating *cucul* links in install section (Makefile way doesn't work)
- added install.patch
- packaged caca_types.h

---- Files affected:
packages/libcaca:
   libcaca.spec (1.30 -> 1.31) , install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libcaca/libcaca.spec
diff -u packages/libcaca/libcaca.spec:1.30 packages/libcaca/libcaca.spec:1.31
--- packages/libcaca/libcaca.spec:1.30	Tue Jun  2 00:43:25 2009
+++ packages/libcaca/libcaca.spec	Mon Oct 26 20:11:15 2009
@@ -21,6 +21,7 @@
 Group:		Libraries
 Source0:	http://libcaca.zoy.org/files/libcaca/%{name}-%{version}.%{subver}.tar.gz
 # Source0-md5:	3953bf4a803747b63a99f50125563151
+Patch0:		install.patch
 URL:		http://libcaca.zoy.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf >= 2.50
@@ -204,6 +205,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}.%{subver}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -243,6 +245,24 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*.3caca
 rm -rf $RPM_BUILD_ROOT%{_docdir}/libcucul-dev
 
+cd $RPM_BUILD_ROOT%{_libdir}
+for i in libcaca*.so.*.*.*; do
+	ln -sf $i $(echo $i |sed 's/caca/cucul/')
+done
+ln -sf libcaca.a	$RPM_BUILD_ROOT%{_libdir}/libcucul.a
+ln -sf libcaca.la	$RPM_BUILD_ROOT%{_libdir}/libcucul.la
+ln -sf libcaca.so	$RPM_BUILD_ROOT%{_libdir}/libcucul.so
+ln -sf libcaca.so.0 	$RPM_BUILD_ROOT%{_libdir}/libcucul.so.0
+ln -sf libcaca++.a	$RPM_BUILD_ROOT%{_libdir}/libcucul++.a
+ln -sf libcaca++.la	$RPM_BUILD_ROOT%{_libdir}/libcucul++.la
+ln -sf libcaca++.so 	$RPM_BUILD_ROOT%{_libdir}/libcucul++.so
+ln -sf libcaca++.so.0 	$RPM_BUILD_ROOT%{_libdir}/libcucul++.so.0
+ln -sf caca-sharp 	$RPM_BUILD_ROOT%{_libdir}/cucul-sharp
+ln -sf caca++.h 	$RPM_BUILD_ROOT%{_includedir}/cucul++.h
+ln -sf caca_types.h 	$RPM_BUILD_ROOT%{_includedir}/cucul_types.h
+#ln -sf caca_types++.h 	$RPM_BUILD_ROOT%{_includedir}/cucul_types++.h
+ln -sf caca.so 		$RPM_BUILD_ROOT%{ruby_sitearchdir}/cucul.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -295,6 +315,7 @@
 %{_libdir}/libcucul.la
 %{_includedir}/caca.h
 %{_includedir}/caca0.h
+%{_includedir}/caca_types.h
 %{_includedir}/cucul.h
 %{_includedir}/cucul_types.h
 %{_pkgconfigdir}/caca.pc
@@ -349,6 +370,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/10/26 19:11:15  sls
+- creating *cucul* links in install section (Makefile way doesn't work)
+- added install.patch
+- packaged caca_types.h
+
 Revision 1.30  2009/06/01 22:43:25  gotar
 - img subpackage doesn't require same EVR, there are apps only so use autodep
 - note on ncurses driver

================================================================
Index: packages/libcaca/install.patch
diff -u /dev/null packages/libcaca/install.patch:1.1
--- /dev/null	Mon Oct 26 20:11:21 2009
+++ packages/libcaca/install.patch	Mon Oct 26 20:11:15 2009
@@ -0,0 +1,32 @@
+--- libcaca-0.99.beta16/caca/Makefile.am.orig	2009-10-26 17:42:20.565941794 +0100
++++ libcaca-0.99.beta16/caca/Makefile.am	2009-10-26 17:44:42.556183128 +0100
+@@ -65,13 +65,6 @@
+ 	driver/win32.c \
+ 	$(NULL)
+ 
+-install-exec-local:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	. libcaca.la; \
+-	for x in $$library_names; do \
+-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+-	done
+-
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+ 	ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
+--- libcaca-0.99.beta16/cxx/Makefile.am.orig	2009-10-26 17:45:07.054499416 +0100
++++ libcaca-0.99.beta16/cxx/Makefile.am	2009-10-26 17:45:18.553709100 +0100
+@@ -23,13 +23,6 @@
+ cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
+ 
+ if USE_CXX
+-install-exec-local:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	. libcaca++.la; \
+-	for x in $$library_names; do \
+-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+-	done
+-
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+ 	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcaca/libcaca.spec?r1=1.30&r2=1.31&f=u