SPECS: splashutils.spec - start update to 1.5.4 (for fbcondecor no...

[glen]

Author: glen                         Date: Wed Apr 16 00:19:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- start update to 1.5.4 (for fbcondecor now, but call it generic splash)

---- Files affected:
SPECS:
   splashutils.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/splashutils.spec
diff -u SPECS/splashutils.spec:1.29 SPECS/splashutils.spec:1.30
--- SPECS/splashutils.spec:1.29	Tue Apr 15 18:57:56 2008
+++ SPECS/splashutils.spec	Wed Apr 16 02:19:12 2008
@@ -1,65 +1,84 @@
 # $Revision$, $Date$
-#
 # TODO
-#	- find a way to make it work on startup (not initrd imo, at kernel
-#		time - initramfs) + maybe some init.d
-#	- check initramfs (upgrade geninitrd maybe), cause splashutils can
-#		make use of it
-#	- update dirs in scripts
-#
-Summary:	Utilities for setting fbsplash
-Summary(pl.UTF-8):	Narzędzia do ustawiania fbsplash
+# - finish static linking
+# Conditional build:
+%bcond_with	verbose		# verbose build (V=1)
+
+%define		misc_ver	0.1.5
+Summary:	Utilities for setting splash
+Summary(pl.UTF-8):	Narzędzia do ustawiania splash
 Name:		splashutils
-Version:	1.3
-Release:	2
+Version:	1.5.4
+Release:	0.1
 License:	GPL
 Group:		Applications/System
-Source0:	http://dev.gentoo.org/~spock/projects/gensplash/archive/%{name}-%{version}.tar.bz2
-# Source0-md5:	c7c92b98e34b860511aa57bd29d62f76
-%define		misc_ver	0.1.5
+Source0:	http://dev.gentoo.org/~spock/projects/splashutils/archive/%{name}-%{version}.tar.bz2
+# Source0-md5:	325e11440bb040c72b71556ece17a7dd
 Source1:	http://dev.gentoo.org/~spock/projects/gensplash/archive/misc%{name}-%{misc_ver}.tar.bz2
 # Source1-md5:	20fc3ed2407edc8cd97623bf7f1c5c7b
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
-Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-compile.patch
-Patch2:		%{name}-pld-paths.patch
-Patch3:		%{name}-no-dereference.patch
-URL:		http://dev.gentoo.org/~spock/projects/gensplash/
+Patch0:		%{name}-libs.patch
+#Patch0: %{name}-makefile.patch # in -libs now
+#Patch1: %{name}-compile.patch
+#Patch2: %{name}-pld-paths.patch
+URL:		http://dev.gentoo.org/~spock/projects/splashutils/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	freetype-static
 BuildRequires:	glibc-static
+BuildRequires:	gpm-static
 BuildRequires:	klibc-static >= 1.1.1-1
+BuildRequires:	lcms-static
 BuildRequires:	libjpeg-static
+BuildRequires:	libmng-static
 BuildRequires:	libpng-static
 BuildRequires:	linux-libc-headers >= 7:2.6.9.1-1.5
 BuildRequires:	zlib-static
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
-Suggests:	fbsplash-theme
+Suggests:	splash-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Utilities for setting fbsplash.
+Utilities for setting splash.
 
 %description -l pl.UTF-8
-Narzędzia do ustawiania fbsplash.
+Narzędzia do ustawiania splash.
 
 %prep
-%setup -q -a1
-%patch0 -p0
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%setup -q %{?notyet:-a1}
+%patch0 -p1
+#%patch0 -p0
+#%patch1 -p0
+#%patch2 -p1
+
+mkdir -p nobuild
+mv libs/freetype-* nobuild
+mv libs/jpeg-* nobuild
+mv libs/libpng-* nobuild
+mv libs/zlib-* nobuild
+mv configure{,.dist}
 
 %build
-./configure \
-	--with-fbsplash \
-	--with-fifo=/var/run/splashutils/.splash \
-	--with-png \
+if [ ! -f configure -o configure.ac -nt configure ]; then
+	%{__aclocal}
+	%{__autoconf}
+	%{__autoheader}
+	%{__automake}
+fi
+%configure \
 	--with-themedir=%{_sysconfdir}/splash \
+	--with-gpm \
+	--with-mng \
+	--with-png \
+	--with-png \
 	--with-ttf \
-	--with-ttfkern
+	--with-ttf-kernel \
 
+%{__make} %{?with_verbose:QUIET=false}
+
+%if 0
 %{__make} objdir
 
 %{__make} splash_kern \
@@ -72,6 +91,7 @@
 %{__make} -C miscsplashutils-%{misc_ver} \
 	CFLAGS="%{rpmcflags} -Os -I/usr/include/freetype2" \
 	LIBDIR="%{_libdir}"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,30 +100,32 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
+%if 0
 install miscsplashutils-%{misc_ver}/{fbres,fbtruetype/{fbtruetype,fbtruetype.static}} $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/fbsplash
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/fbsplash
+%endif
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/splash
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/splash
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add fbsplash
+/sbin/chkconfig --add splash
 
 %preun
 if [ "$1" = "0" ]; then
-	/sbin/chkconfig --del fbsplash
+	/sbin/chkconfig --del splash
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README docs/*
 %dir %{_sysconfdir}/splash
-%dir %attr(755,root,root) /var/run/splashutils
+%dir /var/run/splashutils
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) /sbin/*
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fbsplash
-%attr(754,root,root) /etc/rc.d/init.d/fbsplash
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/splash
+%attr(754,root,root) /etc/rc.d/init.d/splash
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -111,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2008-04-16 00:19:12  glen
+- start update to 1.5.4 (for fbcondecor now, but call it generic splash)
+
 Revision 1.29  2008-04-15 16:57:56  qboosh
 - use archive URL for miscsplashutils too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/splashutils.spec?r1=1.29&r2=1.30&f=u