rpms/libcaca/F-9 libcaca-0.99.beta16-multilib.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libcaca.spec, 1.16, 1.17 sources, 1.3, 1.4
Matthias Saou
thias at fedoraproject.org
Wed Apr 15 12:49:41 UTC 2009
Author: thias
Update of /cvs/extras/rpms/libcaca/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16704/F-9
Modified Files:
.cvsignore libcaca.spec sources
Added Files:
libcaca-0.99.beta16-multilib.patch
Log Message:
Backport latest devel changes to F-9 (full update) and F-10 (multilib fix + keep upgrade path).
libcaca-0.99.beta16-multilib.patch:
--- NEW FILE libcaca-0.99.beta16-multilib.patch ---
diff -Naupr libcaca-0.99.beta16.orig/caca-config.in libcaca-0.99.beta16/caca-config.in
--- libcaca-0.99.beta16.orig/caca-config.in 2008-09-27 17:58:05.000000000 +0200
+++ libcaca-0.99.beta16/caca-config.in 2008-12-21 14:52:39.462372516 +0100
@@ -6,7 +6,16 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-lib_dir=@libdir@
+# Fedora specific hack to share the same script on all archs
+ARCH=$(uname -m)
+case ${ARCH} in
+x86_64|ia64|s390)
+ lib_dir=@prefix@/lib64
+ ;;
+*)
+ lib_dir=@prefix@/lib
+ ;;
+esac
include_dir=@includedir@
usage()
@@ -114,6 +123,6 @@ fi
if test "$echo_libs" = "yes"
then
- echo -L at libdir@ $libs
+ echo -L$lib_dir $libs
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 29 Mar 2007 14:00:29 -0000 1.3
+++ .cvsignore 15 Apr 2009 12:49:10 -0000 1.4
@@ -1 +1 @@
-libcaca-0.99.beta11.tar.gz
+libcaca-0.99.beta16.tar.gz
Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-9/libcaca.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libcaca.spec 20 Feb 2008 04:19:35 -0000 1.16
+++ libcaca.spec 15 Apr 2009 12:49:11 -0000 1.17
@@ -1,13 +1,14 @@
-%define beta beta11
+%define beta beta16
Summary: Library for Colour AsCii Art, text mode graphics
Name: libcaca
Version: 0.99
-Release: 0.4.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
License: WTFPL
Group: System Environment/Libraries
URL: http://libcaca.zoy.org/
-Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
+Source: http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-%{version}.%{beta}.tar.gz
+Patch0: libcaca-0.99.beta16-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: slang-devel
BuildRequires: ncurses-devel
@@ -68,6 +69,7 @@
%prep
%setup -q -n libcaca-%{version}.%{beta}
+%patch0 -p1
%build
@@ -79,10 +81,12 @@
%install
-%{__rm} -rf %{buildroot} libcucul-dev-docs
+%{__rm} -rf %{buildroot} libcaca-dev-docs
%makeinstall
# We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
+%{__mv} %{buildroot}%{_docdir}/libcaca-dev libcaca-dev-docs
+# Remove symlink to libcaca-dev
+%{__rm} -f %{buildroot}%{_docdir}/libcucul-dev
%clean
@@ -93,6 +97,7 @@
%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc COPYING
@@ -100,7 +105,7 @@
%files devel
%defattr(-,root,root,-)
-%doc ChangeLog libcucul-dev-docs/*
+%doc ChangeLog libcaca-dev-docs/html/
%{_bindir}/caca-config
%{_includedir}/*.h
%{_libdir}/pkgconfig/*.pc
@@ -112,23 +117,34 @@
%files -n caca-utils
%defattr(-,root,root,-)
-%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
+%doc AUTHORS COPYING* NEWS NOTES README THANKS
%{_bindir}/cacademo
%{_bindir}/cacafire
%{_bindir}/cacaplay
%{_bindir}/cacaserver
%{_bindir}/cacaview
-%{_bindir}/img2irc
+%{_bindir}/img2txt
%{_datadir}/libcaca/
%{_mandir}/man1/cacademo.1*
%{_mandir}/man1/cacafire.1*
%{_mandir}/man1/cacaplay.1*
%{_mandir}/man1/cacaserver.1*
%{_mandir}/man1/cacaview.1*
-%{_mandir}/man1/img2irc.1*
+%{_mandir}/man1/img2txt.1*
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.7.beta16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.6.beta16
+- Add patch to share the same caca-config for 32 and 64bit (#341951).
+- Don't include the pdf devel doc, only html (again, fixed multilib conflict).
+
+* Mon Oct 27 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.5.beta16
+- Update to 0.99beta16.
+- Update Source URL.
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99-0.4.beta11
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcaca/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 29 Mar 2007 14:00:29 -0000 1.3
+++ sources 15 Apr 2009 12:49:11 -0000 1.4
@@ -1 +1 @@
-94f3ae45b9d7fed43a6511452e880937 libcaca-0.99.beta11.tar.gz
+3953bf4a803747b63a99f50125563151 libcaca-0.99.beta16.tar.gz
More information about the fedora-extras-commits
mailing list