Mailinglist Archive: yast-commit (477 mails)

[mvidner@xxxxxxxxxxxxxxxx]

Author: mvidner
Date: Fri Jun 26 11:44:14 2009
New Revision: 57759

URL: http://svn.opensuse.org/viewcvs/yast?rev=57759&view=rev
Log:
YastCommon.cmake: don't override License, Group

Modified:
    trunk/devtools/devtools/cmake/modules/YastCommon.cmake
    trunk/devtools/package/yast2-devtools.changes

Modified: trunk/devtools/devtools/cmake/modules/YastCommon.cmake
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/YastCommon.cmake?rev=57759&r1=57758&r2=57759&view=diff
==============================================================================
--- trunk/devtools/devtools/cmake/modules/YastCommon.cmake (original)
+++ trunk/devtools/devtools/cmake/modules/YastCommon.cmake Fri Jun 26 11:44:14 
2009
@@ -66,6 +66,17 @@
     SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in)
   ENDIF (NOT EXISTS ${SPECIN})
 
+  # License and Group may be present(new) or missing(old)
+  FILE(READ ${SPECIN} SPECIN_S)
+  # test only in main package, HEADER is not used for subpackages
+  STRING(REGEX REPLACE "\n%package.*" "" SPECIN_S ${SPECIN_S})
+  IF(NOT SPECIN_S MATCHES "\nLicense:")
+    SET(DEFAULTLICENSE "License:\tGPL")
+  ENDIF(NOT SPECIN_S MATCHES "\nLicense:")
+  IF(NOT SPECIN_S MATCHES "\nGroup:")
+    SET(DEFAULTGROUP "Group:\tSystem/YaST")
+  ENDIF(NOT SPECIN_S MATCHES "\nGroup:")
+
   SET(HEADERCOMMENT
     "#
 # spec file for package ${RPMNAME} (Version ${VERSION})
@@ -77,8 +88,8 @@
 "Name:           ${RPMNAME}
 Version:        ${VERSION}
 Release:        0
-License:        GPL
-Group:          System/YaST
+${DEFAULTLICENSE}
+${DEFAULTGROUP}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        ${RPMNAME}-${VERSION}.tar.bz2"
     )

Modified: trunk/devtools/package/yast2-devtools.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.changes?rev=57759&r1=57758&r2=57759&view=diff
==============================================================================
--- trunk/devtools/package/yast2-devtools.changes (original)
+++ trunk/devtools/package/yast2-devtools.changes Fri Jun 26 11:44:14 2009
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Fri Jun 26 11:44:08 CEST 2009 - mvidner@xxxxxxx
+
+- YastCommon.cmake: don't override License, Group
+
+-------------------------------------------------------------------
 Mon Jun 22 15:49:50 CEST 2009 - mvidner@xxxxxxx
 
 - create-spec: don't override License, Group, %build

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx