packages: slim/slim-Makefile.patch, slim/slim.spec, slim/slim-stdio.patch (...

[glen]

Author: glen                         Date: Tue Jul 12 20:59:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.2

---- Files affected:
packages/slim:
   slim-Makefile.patch (1.6 -> 1.7) , slim.spec (1.31 -> 1.32) , slim-stdio.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/slim/slim-Makefile.patch
diff -u packages/slim/slim-Makefile.patch:1.6 packages/slim/slim-Makefile.patch:1.7
--- packages/slim/slim-Makefile.patch:1.6	Sat Jan 30 23:10:34 2010
+++ packages/slim/slim-Makefile.patch	Tue Jul 12 22:59:46 2011
@@ -1,6 +1,5 @@
-diff -urN slim-1.3.0/Makefile slim-1.3.0.new/Makefile
---- slim-1.3.0/Makefile	2007-08-26 11:34:21.095490552 +0200
-+++ slim-1.3.0.new/Makefile	2007-08-26 11:41:40.028528565 +0200
+--- slim-1.3.2/Makefile~	2011-07-12 23:56:02.000000000 +0300
++++ slim-1.3.2/Makefile	2011-07-12 23:57:17.805261930 +0300
 @@ -5,9 +5,9 @@
  #######################################################
  CXX=/usr/bin/g++
@@ -8,8 +7,8 @@
 -CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 +override CFLAGS += -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng14 -I/usr/include
  CXXFLAGS=$(CFLAGS)
--LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
-+override LDFLAGS += -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng14 -lz -lm -lcrypt -lXmu -lpng -ljpeg
+-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
++override LDFLAGS += -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng14 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
  CUSTOM=-DHAVE_SHADOW
  ifdef USE_PAM
  LDFLAGS+= -lpam

================================================================
Index: packages/slim/slim.spec
diff -u packages/slim/slim.spec:1.31 packages/slim/slim.spec:1.32
--- packages/slim/slim.spec:1.31	Sat Jan 30 23:11:12 2010
+++ packages/slim/slim.spec	Tue Jul 12 22:59:46 2011
@@ -6,23 +6,23 @@
 Summary:	SLiM - a desktop-independent graphical login manager
 Summary(pl.UTF-8):	SLiM - niezależny od środowiska graficzny zarządca logowania
 Name:		slim
-Version:	1.3.1
-Release:	2
+Version:	1.3.2
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://download.berlios.de/slim/%{name}-%{version}.tar.gz
-# Source0-md5:	727d0acb24c0fbf0751134c37a9c895f
+# Source0-md5:	ca1ae6120e6f4b4969f2d6cf94f47b42
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-configuration.patch
 Patch1:		%{name}-Makefile.patch
-Patch2:		%{name}-stdio.patch
 URL:		http://slim.berlios.de/
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:    rpmbuild(macros) >= 1.450
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXrender-devel
@@ -74,7 +74,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__make} \
@@ -86,15 +85,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	CFGDIR=%{_sysconfdir}/X11/slim \
 	MANDIR=%{_mandir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install -d $RPM_BUILD_ROOT/etc/security
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,security}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 :> $RPM_BUILD_ROOT/etc/security/blacklist.slim
 
 %clean
@@ -102,13 +100,9 @@
 
 %post
 /sbin/chkconfig --add slim
-if [ -f /var/lock/subsys/slim ]; then
-	echo "Run \"/sbin/service slim restart\" to restart slim." >&2
-	echo "WARNING: it will terminate all sessions opened from slim!" >&2
-else
-	echo "Run \"/sbin/service slim start\" to start slim." >&2
-fi
-cat << EOF
+# -n option not to actually restart as it will terminate all sessions opened from slim!
+%service -n slim restart
+%banner -e %{name} <<EOF
 NOTE: You need to prepare ~/.xinitrc to make slim work.
 Take a look at %{_docdir}/%{name}-%{version}/xinitrc.example
 EOF
@@ -137,6 +131,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2011/07/12 20:59:46  glen
+- up to 1.3.2
+
 Revision 1.31  2010/01/30 22:11:12  megabajt
 - fixed build with libpng 1.4
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/slim/slim-Makefile.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/slim/slim.spec?r1=1.31&r2=1.32&f=u