[packages/kdebase/dev-trinity] updated kdebase-kdmconfig.patch to cmake

glen glen at pld-linux.org
Wed Jun 4 23:11:50 CEST 2014


commit 3e9bd17afaaaac53df7e4dbe4eb79e08a91d63dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jun 4 11:59:33 2014 +0300

    updated kdebase-kdmconfig.patch to cmake

 kdebase-kdmconfig.patch | 13 ++++++++++++-
 kdebase.spec            |  2 --
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index ec07a6d..fbfc766 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -1429,9 +1429,7 @@ touch kappfinder.lang
 %{__sed} -i -e '/apidocs/d' *.lang
 
 %if %{with kdm}
-mv $RPM_BUILD_ROOT{%{_datadir}/config/kdm/*,/etc/X11/kdm}
 %{__rm} $RPM_BUILD_ROOT/etc/X11/kdm/README
-#%{__rm} $RPM_BUILD_ROOT%{_docdir}/kdm/README
 %endif
 
 %clean
diff --git a/kdebase-kdmconfig.patch b/kdebase-kdmconfig.patch
index a952d53..d36b706 100644
--- a/kdebase-kdmconfig.patch
+++ b/kdebase-kdmconfig.patch
@@ -73,10 +73,21 @@
  
  install-data-local: genkdmconf
 -	./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
-+	./genkdmconf --no-old --in $(DESTDIR)/etc/X11/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
++	./genkdmconf --in $(DESTDIR)/etc/X11/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
  
  messages:
  	$(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot
+--- kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt~	2012-09-16 15:52:03.000000000 +0300
++++ kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt	2014-06-04 11:10:30.672252448 +0300
+@@ -35,7 +35,7 @@
+   set( GENKDMCONF_FLAGS "--no-old" )
+ endif( )
+ 
+-install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
++install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}/etc/X11/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
+ 
+ 
+ ##### config.ci (generated) #####################
 --- kdebase-trinity-3.5.13.2/kdm/config.def~	2014-05-27 13:55:54.000000000 +0300
 +++ kdebase-trinity-3.5.13.2/kdm/config.def	2014-05-27 14:35:25.710243084 +0300
 @@ -29,7 +29,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/f59a30135a5137d2c2904517cb7332a2714f9ab0



More information about the pld-cvs-commit mailing list