rpms/libcaca/FC-6 .cvsignore, 1.2, 1.3 libcaca.spec, 1.12, 1.13 sources, 1.2, 1.3 libcaca-0.9-man3.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/libcaca/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7216

Modified Files:
	.cvsignore libcaca.spec sources 
Removed Files:
	libcaca-0.9-man3.patch 
Log Message:
Backport update to libcaca 0.99.beta11 from devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:42:00 -0000	1.2
+++ .cvsignore	10 Apr 2007 14:55:46 -0000	1.3
@@ -1 +1 @@
-libcaca-0.9.tar.bz2
+libcaca-0.99.beta11.tar.gz


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/FC-6/libcaca.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libcaca.spec	28 Aug 2006 11:24:21 -0000	1.12
+++ libcaca.spec	10 Apr 2007 14:55:46 -0000	1.13
@@ -1,15 +1,24 @@
+%define beta beta11
+
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
-Version: 0.9
-Release: 11%{?dist}
+Version: 0.99
+Release: 0.1.%{beta}%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-URL: http://sam.zoy.org/projects/libcaca/
-Source: http://sam.zoy.org/projects/libcaca/libcaca-%{version}.tar.bz2
-Patch: libcaca-0.9-man3.patch
+URL: http://libcaca.zoy.org/
+Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: libX11-devel, libXt-devel, ncurses-devel >= 5, slang-devel
-Buildrequires: imlib2-devel, zlib-devel, doxygen, tetex-latex, tetex-dvips
+BuildRequires: slang-devel
+BuildRequires: ncurses-devel
+BuildRequires: libX11-devel
+BuildRequires: glut-devel
+BuildRequires: imlib2-devel
+BuildRequires: pango-devel
+# For the docs
+Buildrequires: doxygen
+Buildrequires: tetex-latex
+Buildrequires: tetex-dvips
 
 %description
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -20,7 +29,13 @@
 %package devel
 Summary: Development files for libcaca, the library for Colour AsCii Art
 Group: Development/Libraries
-Requires: libX11-devel, ncurses-devel >= 5, slang-devel
+Requires: %{name} = %{version}-%{release}
+Requires: slang-devel
+Requires: ncurses-devel
+Requires: libX11-devel
+Requires: glut-devel
+Requires: imlib2-devel
+Requires: pango-devel
 
 %description devel
 libcaca is the Colour AsCii Art library. It provides high level functions
@@ -52,60 +67,77 @@
 
 
 %prep
-%setup
-%patch -p1 -b .man3
+%setup -q -n libcaca-%{version}.%{beta}
 
 
 %build
-%configure \
-    --x-includes=%{_includedir} \
-    --x-libraries=%{_libdir} \
-    --enable-slang \
-    --enable-ncurses \
-    --enable-x11 \
-    --enable-imlib2
+%configure --disable-rpath
+# Remove useless rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf %{buildroot}
+%{__rm} -rf %{buildroot} libcucul-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/%{name}-dev %{name}-devel-docs
+%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*.so.*
+
 %files devel
-%defattr(-, root, root, 0755)
-%doc COPYING %{name}-devel-docs/*
-%{_libdir}/*.a
+%defattr(-,root,root,-)
+%doc ChangeLog libcucul-dev-docs/*
 %{_bindir}/caca-config
-%{_includedir}/*
+%{_includedir}/*.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
 %{_mandir}/man1/caca-config.1*
-#{_mandir}/man3/*
+%{_mandir}/man3/*
 
 %files -n caca-utils
-%defattr(-, root, root, 0755)
-%doc AUTHORS BUGS COPYING NEWS NOTES README THANKS TODO
-%{_bindir}/cacaball
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
 %{_bindir}/cacademo
 %{_bindir}/cacafire
-%{_bindir}/cacamoir
-%{_bindir}/cacaplas
+%{_bindir}/cacaplay
+%{_bindir}/cacaserver
 %{_bindir}/cacaview
+%{_bindir}/img2irc
 %{_datadir}/libcaca/
-%{_mandir}/man1/cacaball.1*
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
-%{_mandir}/man1/cacamoir.1*
-%{_mandir}/man1/cacaplas.1*
+%{_mandir}/man1/cacaplay.1*
+%{_mandir}/man1/cacaserver.1*
 %{_mandir}/man1/cacaview.1*
+%{_mandir}/man1/img2irc.1*
 
 
 %changelog
+* Thu Mar 29 2007 Matthias Saou <http://freshrpms.net/> 0.99-0.1.beta11
+- Update to 0.99beta11.
+- We now have a main libcaca package with just the shared lib (built by default
+  now), so make the devel sub-package require it too. Leave static lib for now.
+- Enable opengl and pango support.
+- Remove useless rpath.
+- Remove no longer needed man3 patch.
+- Remove all configure options, they're autodetected.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.9-11
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:42:00 -0000	1.2
+++ sources	10 Apr 2007 14:55:46 -0000	1.3
@@ -1 +1 @@
-c7d5c46206091a9203fcb214abb25e4a  libcaca-0.9.tar.bz2
+94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz


--- libcaca-0.9-man3.patch DELETED ---