Mailinglist Archive: yast-commit (477 mails)

[mvidner@xxxxxxxxxxxxxxxx]

Author: mvidner
Date: Fri Jun 26 11:39:30 2009
New Revision: 57756

URL: http://svn.opensuse.org/viewcvs/yast?rev=57756&view=rev
Log:
Moved variables to the SPECFILE macro
to prepare for the next fix.

Modified:
    trunk/devtools/devtools/cmake/modules/YastCommon.cmake

Modified: trunk/devtools/devtools/cmake/modules/YastCommon.cmake
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/YastCommon.cmake?rev=57756&r1=57755&r2=57756&view=diff
==============================================================================
--- trunk/devtools/devtools/cmake/modules/YastCommon.cmake (original)
+++ trunk/devtools/devtools/cmake/modules/YastCommon.cmake Fri Jun 26 11:39:30 
2009
@@ -52,59 +52,52 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 SET ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} 
${CMAKE_CURRENT_BINARY_DIR})
+
 ####################################################################
 # RPM SPEC                                                         #
 ####################################################################
-MESSAGE(STATUS "Writing spec file...")
 
-SET(HEADERCOMMENT
-"#
+MACRO(SPECFILE)
+  MESSAGE(STATUS "Writing spec file...")
+  
+  SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.cmake)
+  IF (NOT EXISTS ${SPECIN})
+    SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in)
+  ENDIF (NOT EXISTS ${SPECIN})
+
+  SET(HEADERCOMMENT
+    "#
 # spec file for package ${RPMNAME} (Version ${VERSION})
 #
 # norootforbuild",
-#"/work/built/info/failed/
-)
+    )
 
-SET(HEADER
+  SET(HEADER
 "Name:           ${RPMNAME}
 Version:        ${VERSION}
 Release:        0
 License:        GPL
 Group:          System/YaST
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build\n
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        ${RPMNAME}-${VERSION}.tar.bz2"
-)
+    )
 
-SET(PREP
+  SET(PREP
 "%prep
 %setup -n ${RPMNAME}-${VERSION}"
-)
+    )
 
-SET(CLEAN
+  SET(CLEAN
 "%clean
 rm -rf \"\$RPM_BUILD_ROOT\""
-)
+    )
 
-
-SET(INSTALL
+  SET(INSTALL
 "%install
 make install DESTDIR=\"$RPM_BUILD_ROOT\""
-)
-
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} 
${CMAKE_CURRENT_BINARY_DIR})
+    )
 
-####################################################################
-# RPM SPEC                                                         #
-####################################################################
-
-MACRO(SPECFILE)
-  MESSAGE(STATUS "Writing spec file...")
-  
-  SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.cmake)
-  IF (NOT EXISTS ${SPECIN})
-    SET(SPECIN ${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in)
-  ENDIF (NOT EXISTS ${SPECIN})
-  
   CONFIGURE_FILE(${SPECIN} ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY)
   MESSAGE(STATUS "I hate you rpm-lint...!!!")
   IF (EXISTS ${CMAKE_SOURCE_DIR}/package/${PACKAGE}-rpmlint.cmake)

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