packages: slim/slim-configuration.patch, slim/slim.spec, slim/cmake.patch (...

Sat Mar 24 11:21:11 CET 2012

Author: glen                         Date: Sat Mar 24 10:21:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.3, uses now make for build

---- Files affected:
packages/slim:
   slim-configuration.patch (1.3 -> 1.4) , slim.spec (1.44 -> 1.45) , cmake.patch (NONE -> 1.1)  (NEW), slim-Makefile.patch (1.8 -> NONE)  (REMOVED), slim-libpng15.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/slim/slim-configuration.patch
diff -u packages/slim/slim-configuration.patch:1.3 packages/slim/slim-configuration.patch:1.4

--- packages/slim/slim-configuration.patch:1.3	Tue Jan 17 07:51:42 2012
+++ packages/slim/slim-configuration.patch	Sat Mar 24 11:21:06 2012
@@ -1,6 +1,5 @@
-diff -urN slim-1.3.0/slim.conf slim-1.3.0.config/slim.conf
---- slim-1.3.0/slim.conf	2007-07-15 16:09:28.000000000 +0200
-+++ slim-1.3.0.config/slim.conf	2007-08-26 12:18:33.298886487 +0200
+--- slim-1.3.3/slim.conf~	2012-03-24 04:34:36.000000000 +0200
++++ slim-1.3.3/slim.conf	2012-03-24 04:35:14.379078673 +0200
 @@ -5,7 +5,7 @@
  #xserver_arguments   -dpi 75
  
@@ -14,12 +13,11 @@
  # The current chosen session name is replaced in the login_cmd
  # above, so your login command can handle different sessions.
  # see the xinitrc.sample file shipped with slim sources
--sessions            xfce4,icewm,wmaker,blackbox
-+sessions            xfce4,gnome,kde,icewm,wmaker,blackbox
+-sessions            xfce4,icewm-session,wmaker,blackbox
++sessions            xfce4,gnome,kde,icewm-session,wmaker,blackbox
  
  # Executed when pressing F11 (requires imagemagick)
  screenshot_cmd      import -window root /slim.png
-diff -urN slim-1.3.0/xinitrc.sample slim-1.3.0.config/xinitrc.sample
 --- slim-1.3.0/xinitrc.sample	2007-07-15 16:09:28.000000000 +0200
 +++ slim-1.3.0.config/xinitrc.sample	2007-08-26 12:23:11.756406046 +0200
 @@ -6,6 +6,12 @@

================================================================
Index: packages/slim/slim.spec
diff -u packages/slim/slim.spec:1.44 packages/slim/slim.spec:1.45
--- packages/slim/slim.spec:1.44	Sat Mar 24 03:44:06 2012
+++ packages/slim/slim.spec	Sat Mar 24 11:21:06 2012
@@ -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.2
-Release:	10
+Version:	1.3.3
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://download.berlios.de/slim/%{name}-%{version}.tar.gz
-# Source0-md5:	ca1ae6120e6f4b4969f2d6cf94f47b42
+# Source0-md5:	ce53e44c1e4a2eacf5bb7688ee2a5de8
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-configuration.patch
-Patch1:		%{name}-Makefile.patch
-Patch2:		%{name}-libpng15.patch
+Patch1:		cmake.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:	cmake
 BuildRequires:	rpmbuild(macros) >= 1.450
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXmu-devel
@@ -78,19 +78,18 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
+install -d build
+cd build
+%cmake \
+	-DSYSCONF_INSTALL_DIR=%{_sysconfdir}/X11/slim \
+	..
 %{__make} \
-	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}" \
-	CFGDIR=%{_sysconfdir}/X11/slim
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
 	CFGDIR=%{_sysconfdir}/X11/slim \
 	MANDIR=%{_mandir} \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -149,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2012/03/24 10:21:06  glen
+- up to 1.3.3, uses now make for build
+
 Revision 1.44  2012/03/24 02:44:06  glen
 - typo
 

================================================================
Index: packages/slim/cmake.patch
diff -u /dev/null packages/slim/cmake.patch:1.1
--- /dev/null	Sat Mar 24 11:21:11 2012
+++ packages/slim/cmake.patch	Sat Mar 24 11:21:06 2012
@@ -0,0 +1,34 @@
+#--- 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++
+# CC=/usr/bin/gcc
+#-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/libpng -I/usr/include
+# CXXFLAGS=$(CFLAGS)
+#-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
+#+override LDFLAGS += -lXft -lX11 -lfreetype -lXrender -lfontconfig -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
+# CUSTOM=-DHAVE_SHADOW
+# ifdef USE_PAM
+# LDFLAGS+= -lpam
+#@@ -33,7 +33,7 @@
+# all: slim
+# 
+# slim: $(OBJECTS)
+#-	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
+#+	$(CXX) $(OBJECTS) -o $(NAME) $(LDFLAGS) 
+# 
+# .cpp.o:
+# 	$(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
+--- slim-1.3.3/CMakeLists.txt~	2012-02-22 01:59:52.000000000 +0200
++++ slim-1.3.3/CMakeLists.txt	2012-03-24 12:12:56.665259427 +0200
+@@ -23,7 +23,7 @@
+ 
+ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
+ set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim")
+-set(SYSCONFDIR "/etc")
++set(SYSCONFDIR "${SYSCONF_INSTALL_DIR}")
+ set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
+ 
+ set(SLIM_DEFINITIONS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/slim/slim-configuration.patch?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/slim/slim.spec?r1=1.44&r2=1.45

