new Version 2.43.3

use a common toplevel CMakeLists.txt fix building *-doc pkgs introduce bootstrap.sh
libyui · May 10, 2013 · 496c063 · 496c063
1 parent b5e8cba
commit 496c063
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,7 @@ Makefile.in
 # CMake
 CMakeCache.txt
 CMakeFiles
+CMakeLists.txt
 Makefile
 cmake_install.cmake
 install_manifest.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 10 10:40:00 UTC 2013 - bjoern.esser@gmail.com
+
+- use a common toplevel CMakeLists.txt
+- fix building *-doc pkgs
+- introduce bootstrap.sh
+- Version 2.43.3
+
 -------------------------------------------------------------------
 Mon May  6 13:30:00 UTC 2013 - bjoern.esser@gmail.com
 

diff --git a/Makefile.cvs b/Makefile.cvs
@@ -5,6 +5,7 @@
 all: configure
 
 configure: clean
+	./bootstrap.sh ; \
 	mkdir build ; \
 	cd build ; \
 	cmake -DCMAKE_BUILD_TYPE=RELEASE ..
@@ -18,4 +19,5 @@ reconf:
 	cmake rebuild_cache
 
 clean:
-	rm -rf build
+	rm -rf build \
+		CMakeLists.txt
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "43")
-SET(VERSION_PATCH "2")
+SET(VERSION_PATCH "3")
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+set -e ;
+
+prefix="/usr";
+
+if [ ! -z $1 ];
+then
+  prefix="$1";
+fi;
+
+cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common";
+cmake_target="./CMakeLists.txt";
+
+echo "checking for $cmake_common...";
+
+if [ -f "$cmake_common" ];
+then
+  ln -fs "$cmake_common" "$cmake_target";
+  echo "OK: linked to `pwd`/$cmake_target.";
+else
+  echo "  Use must have libyui(-devel) >= 3.0.4 installed";
+  echo "  in \"$prefix\" first !!!";
+  exit 1;
+fi;
+
+exit 0;
diff --git a/libyui-qt.spec.in b/libyui-qt.spec.in
@@ -29,7 +29,7 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkg-config
 
-%define libyui_devel_version libyui-devel >= 2.42.6
+%define libyui_devel_version libyui-devel >= 3.0.4
 BuildRequires:	%{libyui_devel_version}
 BuildRequires:	libqt4-devel
 Provides:	yui_backend
@@ -45,7 +45,8 @@ Summary:	@SUMMARY@
 Group:		System/Libraries
 
 Requires:	lib@BASELIB@@SONAME_MAJOR@
-Provides:	yast2-qt = 2.42.0
+Provides:	lib@BASELIB@-qt = %{version}
+Provides:	yast2-qt = %{version}
 Obsoletes:	yast2-qt < 2.42.0
 
 URL:		@URL@
@@ -81,6 +82,8 @@ This package has very few dependencies.
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 
+./bootstrap.sh %{_prefix}
+
 mkdir build
 cd build