rpms/linux_logo/devel .cvsignore, 1.8, 1.9 linux_logo.spec, 1.14, 1.15 sources, 1.8, 1.9 linux_logo-4.13-debug.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/linux_logo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26738

Modified Files:
	.cvsignore linux_logo.spec sources 
Removed Files:
	linux_logo-4.13-debug.patch 
Log Message:
Update to 5.01.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Mar 2007 17:34:16 -0000	1.8
+++ .cvsignore	24 Jul 2007 15:42:25 -0000	1.9
@@ -1 +1 @@
-linux_logo-4.16.tar.gz
+linux_logo-5.01.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux_logo.spec	15 Mar 2007 17:34:16 -0000	1.14
+++ linux_logo.spec	24 Jul 2007 15:42:25 -0000	1.15
@@ -1,12 +1,11 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 4.16
-Release: 1%{?dist}
+Version: 5.01
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
 Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
-Patch: linux_logo-4.13-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
 
@@ -16,27 +15,21 @@
 
 %prep
 %setup -q
-%patch -p1 -b .debug
 
 
 %build
+# Bundle all available logos
 for logo in ./logos/*.logo ./logos/*/*.logo; do
     echo "$logo" >> logo_config
 done
-# C_OPTS is used by linux_logo.c and C_FLAGS by libsysinfo
-%{__make} %{?_smp_mflags} \
-    C_OPTS="%{optflags} -I./\$(LIBSYSINFO)" \
-    C_FLAGS="%{optflags} -I.. -I. -I../include"
+# We still need to override CFLAGS later on, configure can't set them
+./configure --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 %{__rm} -rf %{buildroot}
-
-%{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1}
-%{__make} install \
-    INSTALL_BINPATH=%{buildroot}%{_bindir} \
-    INSTALL_MANPATH=%{buildroot}%{_mandir} \
-    INSTALLDIR=%{buildroot}%{_datadir}/locale
+%{__make} install PREFIX=%{buildroot}%{_prefix}
 %find_lang %{name}
 
 
@@ -45,13 +38,18 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
-%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%defattr(-,root,root,-)
+%doc CHANGES* COPYING LINUX_LOGO.FAQ README* TODO USAGE
+%{_bindir}/linux_logo
+%{_mandir}/man1/linux_logo.1*
 
 
 %changelog
+* Tue Jul 24 2007 Matthias Saou <http://freshrpms.net/> 5.01-1
+- Update to 5.01.
+- Remove no longer needed strip patch.
+- Clean up build/install based on the upstream improvements.
+
 * Thu Mar 15 2007 Matthias Saou <http://freshrpms.net/> 4.16-1
 - Update to 4.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2007 17:34:16 -0000	1.8
+++ sources	24 Jul 2007 15:42:25 -0000	1.9
@@ -1 +1 @@
-854429725a1ec35d93cde575ae173efe  linux_logo-4.16.tar.gz
+dccf55ec79e66d4ff957bb87475ccacb  linux_logo-5.01.tar.gz


--- linux_logo-4.13-debug.patch DELETED ---