commit aab494e617a061435059f3ea7b5e6a8d715631e7
Author: Jacek Konieczny <[email protected]>
Date: Thu Dec 12 13:01:38 2013 +0100
Version: 1.3.6
cmake.patch | 30 ++++--------------------------
default-session.patch | 22 +++++++++++++---------
slim-boolean_conflict.patch | 20 ++++++++++++++++++++
slim-link.patch | 26 ++++++++++++++++++++++++++
slim.spec | 17 +++++++++++++----
5 files changed, 76 insertions(+), 39 deletions(-)
---
diff --git a/slim.spec b/slim.spec
index 7e3b7c2..1a5f822 100644
--- a/slim.spec
+++ b/slim.spec
@@ -5,18 +5,20 @@
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.5
-Release: 4
+Version: 1.3.6
+Release: 1
License: GPL v2
Group: X11/Applications
Source0: http://download.berlios.de/slim/%{name}-%{version}.tar.gz
-# Source0-md5: 1153e6993f9c9333e4cf745411d03472
+# Source0-md5: d40d256394f9ef34cef34d2aa9cb52e6
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.pamd
Patch0: %{name}-configuration.patch
Patch1: cmake.patch
Patch2: default-session.patch
+Patch3: %{name}-boolean_conflict.patch
+Patch4: %{name}-link.patch
URL: http://slim.berlios.de/
BuildRequires: ConsoleKit-devel
BuildRequires: cmake
@@ -86,6 +88,8 @@ Możliwości:
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
install -d build
@@ -116,7 +120,9 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
# systemd
install -d $RPM_BUILD_ROOT%{systemdunitdir}
-ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/slim.service
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/slim.service
+
+rm $RPM_BUILD_ROOT%{_libdir}/libslim.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -147,5 +153,8 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/security/blacklist.slim
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/slim
%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/%{name}lock
+%attr(755,root,root) %{_libdir}/libslim.so.*.*.*
%{_mandir}/man1/slim.1*
+%{_mandir}/man1/slimlock.1*
%{_datadir}/%{name}
diff --git a/cmake.patch b/cmake.patch
index 9b02d36..ded360a 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,34 +1,12 @@
-#--- 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
+diff -dur slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/CMakeLists.txt 2013-12-12 10:34:49.000000000 +0100
@@ -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(LIBDIR "/lib")
set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
- set(SLIM_DEFINITIONS)
diff --git a/default-session.patch b/default-session.patch
index 9a32988..5ea2e44 100644
--- a/default-session.patch
+++ b/default-session.patch
@@ -1,11 +1,15 @@
---- slim-1.3.5/panel.cpp~ 2012-12-31 14:03:42.000000000 +0100
-+++ slim-1.3.5/panel.cpp 2013-03-26 12:13:59.251890696 +0100
-@@ -23,7 +23,7 @@
- Root = root;
+diff -dur slim-1.3.6.orig/panel.cpp slim-1.3.6/panel.cpp
+--- slim-1.3.6.orig/panel.cpp 2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/panel.cpp 2013-12-12 10:40:08.000000000 +0100
+@@ -25,8 +25,9 @@
cfg = config;
+ mode = panel_mode;
-- session = "";
-+ session = cfg->nextSession("");
-
- /* Init GC */
- XGCValues gcv;
+- session_name = "";
+- session_exec = "";
++ pair<string,string> ses = cfg->nextSession();
++ session_name = ses.first;
++ session_exec = ses.second;
+ if (mode == Mode_Lock) {
+ Win = root;
+ viewport = GetPrimaryViewport();
diff --git a/slim-boolean_conflict.patch b/slim-boolean_conflict.patch
new file mode 100644
index 0000000..619b336
--- /dev/null
+++ b/slim-boolean_conflict.patch
@@ -0,0 +1,20 @@
+It seems TRUE/FALSE/boolean definitions from various files
+(libjpeg and dbus?) included from image.cpp conflict.
+
+Define them first to resolve the conflicts.
+
+diff -dur slim-1.3.6.orig/image.cpp slim-1.3.6/image.cpp
+--- slim-1.3.6.orig/image.cpp 2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/image.cpp 2013-12-12 11:58:37.000000000 +0100
+@@ -21,6 +21,11 @@
+
+ using namespace std;
+
++#define TRUE 1
++#define FALSE 0
++#define boolean int
++#define HAVE_BOOLEAN 1
++
+ #include "image.h"
+
+ extern "C" {
diff --git a/slim-link.patch b/slim-link.patch
new file mode 100644
index 0000000..ed71663
--- /dev/null
+++ b/slim-link.patch
@@ -0,0 +1,26 @@
+diff -dur slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6.orig/CMakeLists.txt 2013-12-12 12:27:40.000000000 +0100
++++ slim-1.3.6/CMakeLists.txt 2013-12-12 12:39:22.000000000 +0100
+@@ -119,8 +119,7 @@
+ if(PAM_FOUND)
+ message("\tPAM Found")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
+- target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
+- target_link_libraries(slimlock ${PAM_LIBRARY})
++ target_link_libraries(libslim ${PAM_LIBRARY})
+ include_directories(${PAM_INCLUDE_DIR})
+ else(PAM_FOUND)
+ message("\tPAM Not Found")
+@@ -180,6 +179,12 @@
+ target_link_libraries(libslim
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
++ ${CRYPTO_LIB}
++ ${X11_X11_LIB}
++ ${X11_Xft_LIB}
++ ${X11_Xrender_LIB}
++ ${X11_Xrandr_LIB}
++ ${X11_Xmu_LIB}
+ )
+
+ #Set up library with all found packages for slim
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/slim.git/commitdiff/aab494e617a061435059f3ea7b5e6a8d715631e7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
