- creating *cucul* links in install section (Makefile way doesn't work)

- added install.patch
- packaged caca_types.h

Changed files:
    install.patch -> 1.1
    libcaca.spec -> 1.31

diff --git a/install.patch b/install.patch
new file mode 100644 (file)
index 0000000..39b9832
--- /dev/null
+++ b/install.patch
@@ -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

diff --git a/libcaca.spec b/libcaca.spec
index 8347d6859d40b3e02233664670396516529ff0f1..edecccbb71c58022a66bb6f20f3f54334e4d5f18 100644 (file)
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -20,6 +20,7 @@ License:      WTFPL
 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
@@ -203,6 +204,7 @@ Wiązania języka Ruby do libcaca.
 
 %prep
 %setup -q -n %{name}-%{version}.%{subver}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -242,6 +244,24 @@ rm -f $RPM_BUILD_ROOT%{ruby_sitearchdir}/*.{a,la}
 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
 
@@ -294,6 +314,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcucul.la
 %{_includedir}/caca.h
 %{_includedir}/caca0.h
+%{_includedir}/caca_types.h
 %{_includedir}/cucul.h
 %{_includedir}/cucul_types.h
 %{_pkgconfigdir}/caca.pc