update from buildtools

libyui · Jun 14, 2012 · d6fb615 · d6fb615
1 parent f51c2e4
commit d6fb615
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 39 deletions.
diff --git a/RPMINFO.cmake b/RPMINFO.cmake
@@ -2,11 +2,11 @@
 #####
 ##### THIS IS THE INFO REQUIRED FOR SPEC-FILE GENERATION
 
-SET( SPEC_URL			"http://github.com/libyui/libyui-qt/" )						# the URL of the project
+SET( SPEC_Url			"http://github.com/libyui/libyui-qt/" )						# the URL of the project
 
-SET( SPEC_SUMMARY		"Qt frontend for libyui" )							# some brief summary
+SET( SPEC_Summary		"Qt frontend for libyui" )							# some brief summary
 
-SET( SPEC_DESCRIPTION		"This is the user interface frontend that provides Qt UI for libyui\n" )	# the description to be used, end each line with "\n" for line-breaks
+SET( SPEC_Description		"This is the user interface frontend that provides Qt UI for libyui\n" )	# the description to be used, end each line with "\n" for line-breaks
 
 SET( SPEC_BuildRequires		"cmake >= 2.8" "libyui-devel >= 2.21.5" "gcc-c++" "libqt4-devel" "fontconfig-devel" )			# the BuildRequires every single pkg wrapped with "" and speparated with spaces
 

diff --git a/macros.cmake b/macros.cmake
@@ -130,10 +130,10 @@ MACRO( SET_ENVIRONMENT )	# setup the environment vars
   SET( THEME_DIR "${FULL_DATA_DIR}/theme" )
 
   IF( NOT DEFINED DOC_DIR )
-    SET( DOC_DIR "${DATAROOTDIR}/doc/${PROJECTNAME}" )
+    SET( DOC_DIR "${DATAROOTDIR}/doc/${PROJECTNAME}${SONAME_MAJOR}" )
   ELSE( NOT DEFINED DOC_DIR )
     STRING( REPLACE "${PREFIX}/" "" DOC_DIR "${DOC_DIR}" )
-    SET( DOC_DIR "${DOC_DIR}/${PROJECTNAME}" )
+    SET( DOC_DIR "${DOC_DIR}/${PROJECTNAME}${SONAME_MAJOR}" )
   ENDIF( NOT DEFINED DOC_DIR )
 
   SET( INSTALL_DOC_DIR "${DOC_DIR}" )
@@ -244,18 +244,14 @@ MACRO( SET_AUTODOCS )		# looks for doxygen, dot and latex and setup autodocs acc
 
     IF( INSTALL_DOCS OR DOCS_ONLY )
 
-      FOREACH( p css gif html jpg js png )
+      FOREACH( p css gif html jpg js png tag )
         INSTALL(
           DIRECTORY "${CMAKE_BINARY_DIR}/doc/html"
           DESTINATION "${INSTALL_DOC_DIR_PREFIX}"
           FILES_MATCHING PATTERN "*.${p}"
         )
       ENDFOREACH()
 
-      INSTALL(
-        FILES "${CMAKE_BINARY_DIR}/doc/${PROJECTNAME}.tag"
-        DESTINATION "${INSTALL_DOC_DIR_PREFIX}/html"
-      )
     ENDIF( INSTALL_DOCS OR DOCS_ONLY )
 
     CONFIGURE_FILE(
@@ -302,12 +298,6 @@ ENDMACRO( GEN_EXPORTS )
 
 MACRO( GEN_FILES )		# generate files from templates
 
-  FILE(
-    RELATIVE_PATH CONF_REL_INCLUDE_DIR
-    "${INSTALL_CMAKE_DIR_PREFIX}"
-     "${INSTALL_INCLUDE_DIR_PREFIX}"
-  )
-
   FOREACH( p BuildTreeSettings.cmake Config.cmake ConfigVersion.cmake )
     CONFIGURE_FILE(
       "${PROJECT_SOURCE_DIR}/resource/${p}.in"
@@ -349,9 +339,9 @@ ENDMACRO( GEN_FILES )
 MACRO( PREP_SPEC_FILES )
 
   IF( PLUGINNAME )
-  SET( SPEC_LIBDIR "/${BASELIB}/${PROGSUBDIR_UC}" )
-  STRING( REGEX REPLACE "^/+" "/" SPEC_LIBDIR "${SPEC_LIBDIR}" )
-  STRING( REGEX REPLACE "/+$" "" SPEC_LIBDIR "${SPEC_LIBDIR}" )
+  SET( SPEC_Libdir "/${BASELIB}/${PROGSUBDIR_UC}" )
+  STRING( REGEX REPLACE "^/+" "/" SPEC_Libdir "${SPEC_Libdir}" )
+  STRING( REGEX REPLACE "/+$" "" SPEC_Libdir "${SPEC_Libdir}" )
   ENDIF( PLUGINNAME )
 
   FOREACH( p "BuildRequires" "Conflicts" "Provides" "Obsoletes" "DEVEL_Requires" "DEVEL_Provides" )

diff --git a/resource/Config.cmake.in b/resource/Config.cmake.in
@@ -21,11 +21,13 @@ IF( EXISTS "${@PROJECTNAME_UC@_CMAKE_DIR}/CMakeCache.txt" )
    # In build tree
    INCLUDE( "${@PROJECTNAME_UC@_CMAKE_DIR}/@PROJECTNAME_UC@BuildTreeSettings.cmake" )
 ELSE()
-   SET( @PROJECTNAME_UC@_INCLUDE_DIRS "${@PROJECTNAME_UC@_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" )
+   SET( @PROJECTNAME_UC@_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_PREFIX@" )
 ENDIF()
 
 # Our library dependencies (contains definitions for IMPORTED targets)
 INCLUDE( "${@PROJECTNAME_UC@_CMAKE_DIR}/@PROJECTNAME_UC@LibraryDepends.cmake" )
 
 # These are IMPORTED targets created by @PROJECTNAME_UC@LibraryDepends.cmake
 SET( @PROJECTNAME_UC@_LIBRARIES @TARGETLIB@ )
+
+MESSAGE( STATUS "Found @PROJECTNAME_UC@: ${IMPORTED_LOCATION_RELEASE} (Version: @VERSION@)" )
diff --git a/resource/Doxyfile.in b/resource/Doxyfile.in
@@ -7,7 +7,7 @@ DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = @PROJECTNAME@
 PROJECT_NUMBER         = @@varpfx@_VERSION@
 PROJECT_BRIEF          =
-PROJECT_LOGO           = @PROJECT_SOURCE_DIR@/resource/libyui.png
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = @PROJECT_BINARY_DIR@/doc
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -248,7 +248,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
-GENERATE_TAGFILE       = @PROJECT_BINARY_DIR@/doc/@PROJECTNAME@.tag
+GENERATE_TAGFILE       = @PROJECT_BINARY_DIR@/doc/html/@PROJECTNAME@.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl

diff --git a/resource/template-doc.spec.in b/resource/template-doc.spec.in
@@ -20,11 +20,11 @@ BuildRequires:  texlive-latex
 
 Obsoletes:	@PROJECTNAME@-doc < %{version}
 
-URL:		@SPEC_URL@
+URL:		@SPEC_Url@
 Summary:	@PROJECTNAME_UC@ documentation
 
 %description
-@SPEC_DESCRIPTION@
+@SPEC_Description@
 
 This package provides the documentation. (HTML & PDF)
 
@@ -53,7 +53,7 @@ make %{?jobs:-j%jobs} docs
 cd build
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-%fdupes -s $RPM_BUILD_ROOT/%_docdir/@PROJECTNAME@
+%fdupes -s $RPM_BUILD_ROOT/%_docdir/@PROJECTNAME@@SONAME_MAJOR@
 
 
 %clean
@@ -62,7 +62,7 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
-%doc %{_docdir}/@PROJECTNAME@
+%doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@
 %doc COPYING.GPL2
 
 %changelog
diff --git a/resource/template.spec.in b/resource/template.spec.in
@@ -11,11 +11,11 @@ Source:		@PROJECTNAME@-%{version}.tar.bz2
 Group:		System/Libraries
 
 @BuildRequires@
-URL:		@SPEC_URL@
-Summary:	@SPEC_SUMMARY@
+URL:		@SPEC_Url@
+Summary:	@SPEC_Summary@
 
 %description
-@SPEC_DESCRIPTION@
+@SPEC_Description@
 
 %package -n @PROJECTNAME@@SONAME_MAJOR@
 
@@ -24,11 +24,11 @@ Group:		System/Libraries
 @Conflicts@
 @Provides@
 @Obsoletes@
-URL:		@SPEC_URL@
-Summary:	@PROJECTNAME_UC@ - @SPEC_SUMMARY@
+URL:		@SPEC_Url@
+Summary:	@PROJECTNAME_UC@ - @SPEC_Summary@
 
 %description -n @PROJECTNAME@@SONAME_MAJOR@
-@SPEC_DESCRIPTION@
+@SPEC_Description@
 
 
 %package devel
@@ -37,11 +37,11 @@ Group:		Development/Languages/C and C++
 
 @DEVEL_Requires@
 @DEVEL_Provides@
-URL:		@SPEC_URL@
+URL:		@SPEC_Url@
 Summary:	@PROJECTNAME_UC@ header files
 
 %description devel
-@SPEC_DESCRIPTION@
+@SPEC_Description@
 
 This can be used independently of YaST for generic (C++) applications.
 This package has very few dependencies.
@@ -79,7 +79,7 @@ make %{?jobs:-j%jobs}
 %install
 cd build
 make install DESTDIR="$RPM_BUILD_ROOT"
-
+install -d %{buildroot}%{_libdir}/@BASELIB@
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -90,17 +90,18 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files -n @PROJECTNAME@@SONAME_MAJOR@
 %defattr(-,root,root)
+%dir %{_libdir}/@BASELIB@
+%dir %{_libdir}@SPEC_Libdir@
+%{_libdir}@SPEC_Libdir@/lib*.so.*
 %doc COPYING.GPL2
 
-%{_libdir}@SPEC_LIBDIR@/lib*.so.*
-
 %files devel
 %defattr(-,root,root)
+%dir %{_libdir}@SPEC_LIBDIR@
 %{_libdir}@SPEC_LIBDIR@/lib*.so
 %{_prefix}/include/yui
 %{_libdir}/pkgconfig/@PROJECTNAME@.pc
 %{_libdir}/cmake/@PROJECTNAME@
-@SPEC_DEVEL_DOCS@
-%doc COPYING.GPL2
+%doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@
 
 %changelog