SPECS (AC-branch): bootsplash.spec - 3.2, HEAD merge

[havner]

Author: havner                       Date: Fri Jul  7 16:35:45 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 3.2, HEAD merge

---- Files affected:
SPECS:
   bootsplash.spec (1.22 -> 1.22.2.1) 

---- Diffs:

================================================================
Index: SPECS/bootsplash.spec
diff -u SPECS/bootsplash.spec:1.22 SPECS/bootsplash.spec:1.22.2.1
--- SPECS/bootsplash.spec:1.22	Sun Jun 13 21:59:28 2004
+++ SPECS/bootsplash.spec	Fri Jul  7 18:35:39 2006
@@ -4,31 +4,37 @@
 # - place somewhere info that distkernel support only 16bit splashes (thnx Tomasz Grobelny)
 #
 Summary:	Bootsplash - graphical boot process for Linux
+Summary(de):	Bootsplash - graphischer System Start
 Summary(pl):	Bootsplash - graficzny proces startu systemu dla Linuksa
 Name:		bootsplash
-Version:	3.1
+Version:	3.2
 Release:	1
-Epoch:		0
 License:	GPL v2
 Group:		Applications/System
-Source0:	ftp://ftp.suse.com/pub/people/stepan/%{name}/rpm-sources/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5:	f9950a4d61fe6261e3211d317eab0e03
+Source0:	http://www.bootsplash.de/files/splashutils/%{name}-%{version}.tar.bz2
+# Source0-md5:	b74c104372fd182d0442b3ed63210e29
 Source1:	%{name}.script
 Source2:	%{name}-bootanim.script
 Source3:	%{name}.sysconfig
 Source4:	%{name}.init
+Patch0:		%{name}-3.2_makefile_libmng.patch
 URL:		http://www.bootsplash.org/
 BuildRequires:	freetype-devel >= 2.1
 BuildRequires:	libmng-devel
+Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir	/bin
 
 %description
 When you have a kernel with bootsplash capability you can use the
-bootsplash and control it's behaviour with this set of userspace
+bootsplash and control its behaviour with this set of userspace
 utilities.
 
+%description -l de
+Wenn du einen Kernel mit der bootsplash Option hast, kannst du diese
+mit diesen Programmen steuern.
+
 %description -l pl
 Mając jądro z opcją bootsplash można uzyskać graficzny ekran podczas
 startu systemu i sterować jego zachowaniem przy użyciu tego zbioru
@@ -36,6 +42,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} -C Utilities \
@@ -45,7 +52,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},/etc/{bootsplash/themes,rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_sysconfdir}/bootsplash/themes} \
+	 $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/splash
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/bootanim
@@ -59,15 +67,24 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add bootsplash
+
+%preun
+if [ "$1" = "0" ]; then
+	%service bootsplash stop
+	/sbin/chkconfig --del bootsplash
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc {Documentation,Utilities}/README.*
 %attr(755,root,root) %{_bindir}/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/bootsplash
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bootsplash
 %attr(754,root,root) /etc/rc.d/init.d/bootsplash
 %{_datadir}/%{name}
-%dir /etc/bootsplash
-%dir /etc/bootsplash/themes
+%dir %{_sysconfdir}/bootsplash
+%dir %{_sysconfdir}/bootsplash/themes
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -75,6 +92,32 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22.2.1  2006/07/07 16:35:39  havner
+- 3.2, HEAD merge
+
+Revision 1.29  2006/07/07 16:12:53  havner
+- added chkconfig stuff (its off by default anyway, cause
+  BOOT_SPLASH_CONSOLES in default sysconfig file is empty)
+
+Revision 1.28  2006/05/07 01:54:13  glen
+- correct (allow when %_sysconfdir != /etc)
+
+Revision 1.27  2006/05/05 22:22:36  shadzik
+- de; adapterized
+
+Revision 1.26  2006/03/26 13:03:02  djurban
+- updated to 3.2
+
+Revision 1.25  2005/12/04 22:58:06  glen
+- adapterized (sorted %verify flags)
+
+Revision 1.24  2005/11/15 02:52:48  aredridel
+- correct spelling
+
+Revision 1.23  2005/04/09 08:14:45  charles
+- new Source0
+- rm Epoch: 0
+
 Revision 1.22  2004/06/13 19:59:28  arekm
 - updated to 3.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bootsplash.spec?r1=1.22&r2=1.22.2.1&f=u