rpms/kdeutils/devel kdeutils-3.5.7-klaptopdaemon_libXss.patch, NONE, 1.1 kdeutils.spec, 1.89, 1.90

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1315

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.7-klaptopdaemon_libXss.patch 
Log Message:
* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.6.7-2
- fix undefined symbols in %_libdir/kde3/kded_klaptopdaemon.so
- BR: libXScrnSaver-devel 


kdeutils-3.5.7-klaptopdaemon_libXss.patch:

--- NEW FILE kdeutils-3.5.7-klaptopdaemon_libXss.patch ---
--- kdeutils-3.5.7/klaptopdaemon/Makefile.am.Xss	2007-05-14 02:40:45.000000000 -0500
+++ kdeutils-3.5.7/klaptopdaemon/Makefile.am	2007-07-26 09:37:03.000000000 -0500
@@ -9,18 +9,18 @@ libkcmlaptop_la_LIBADD  = $(LIB_KDEUI) 
 
 MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
 kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
-kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst
-kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) libkcmlaptop.la
+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) $(LIB_XSS) -lXtst libkcmlaptop.la
 
 klaptop_acpi_helper_SOURCES = acpi_helper.cpp
 
 klaptop_check_SOURCES = laptop_check.cpp 
-klaptop_check_LDFLAGS = $(all_libraries) 
+klaptop_check_LDFLAGS = $(all_libraries)
 klaptop_check_LDADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
 
 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
 	acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp  
-kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module
+kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) -module -no-undefined
 kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
 kcm_laptop_la_COMPILE_FIRST = crcresult.h
 


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdeutils.spec	16 Jun 2007 21:52:03 -0000	1.89
+++ kdeutils.spec	26 Jul 2007 14:48:03 -0000	1.90
@@ -15,7 +15,7 @@
 Summary: K Desktop Environment - Utilities
 Epoch:   6
 Version: 3.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -30,6 +30,7 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kdeutils-3.5.4-bz#205553.patch
 Patch3: kdeutils-3.5.4-suspend.patch
+Patch4: kdeutils-3.5.7-klaptopdaemon_libXss.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -42,7 +43,7 @@
 BuildRequires: python-devel
 BuildRequires: gmp-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libXtst-devel
+BuildRequires: libXScrnSaver-devel libXtst-devel
 %endif
 BuildRequires: xmms-devel
 
@@ -95,6 +96,7 @@
 %patch1 -p1 -b .label
 %patch2 -p1 -b .bz#205553
 %patch3 -p1 -b .suspend
+%patch4 -p1 -b .libXss
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -119,7 +121,8 @@
    --without-arts \
 %endif
    --includedir=%{_includedir}/kde \
-   --with-snmp
+   --with-snmp \
+   --with-xscreensaver
 
 make %{?_smp_mflags}
 
@@ -345,6 +348,10 @@
 
 
 %changelog
+* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.6.7-2
+- fix undefined symbols in %%_libdir/kde3/kded_klaptopdaemon.so
+- BR: libXScrnSaver-devel 
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1
 - 3.5.7