Merge pull request #8 from bjoern-esser/master

new Version 2.42.8

.gitignore

@@ -0,0 +1,111 @@
+# GNU Autotools
+Makefile.in
+/autom4te.cache
+/aclocal.m4
+/compile
+/configure
+/depcomp
+/install-sh
+/missing
+
+# Object files
+*.o
+
+# Libraries
+*.lib
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+
+# Executables
+*.exe
+*.out
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+
+# Compiled Dynamic libraries
+*.so
+*.so.*
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# CMake
+CMakeCache.txt
+CMakeFiles
+CMakeLists.txt
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+# CMake project-bindir
+build*/
+
+# Archives
+# It's better to unpack these files and commit the raw source because
+# git has its own built in compression methods.
+*.7z
+*.jar
+*.rar
+*.zip
+*.gz
+*.bzip
+*.bz2
+*.xz
+*.lzma
+
+# packing-only formats
+*.iso
+*.tar
+
+# package management formats
+*.dmg
+*.xpi
+*.gem
+*.egg
+*.deb
+*.rpm
+
+# CVS
+/CVS/*
+*/CVS/*
+.cvsignore
+*/.cvsignore*~
+\#*\#
+
+# Emacs
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+
+# Emacs Org-mode
+.org-id-locations
+
+# Unix/Linux
+*_archive
+.*
+!.gitignore
+*~
+*.bak
+*.log
+*.old
+*swp
+tmp
+
+# KDE
+.directory
+
+# Subversion
+.svn/
+
+# OBS commit
+package/

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.42.8
+
 -------------------------------------------------------------------
 Mon May  6 12:11:30 UTC 2013 - bjoern.esser@gmail.com
 

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

VERSION.cmake

@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "42" )
-SET( VERSION_PATCH "7" )
+SET( VERSION_PATCH "8" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

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

libyui-qt-pkg.spec.in

@@ -29,9 +29,9 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkg-config
 BuildRequires:	libqt4-devel
-BuildRequires:	libyui-devel >= 3.0.0
+BuildRequires:	libyui-devel >= 3.0.4
 
-%define libyui_qt_devel_version	libyui-qt-devel >= 2.42.0
+%define libyui_qt_devel_version	libyui-qt-devel >= 2.43.3
 BuildRequires:	%{libyui_qt_devel_version}
 %define libzypp_devel_version		libzypp-devel >= 12.5.0
 BuildRequires:	%{libzypp_devel_version}
@@ -47,7 +47,7 @@ Summary:	@SUMMARY@
 Group:		System/Libraries
 
 Requires:	lib@BASELIB@@SONAME_MAJOR@
-Provides:	lib@BASELIB@-qt = %{version}
+Provides:	lib@BASELIB@-qt-pkg = %{version}
 
 Provides:	yast2-qt-pkg = 2.42.0
 Obsoletes:	yast2-qt-pkg < 2.42.0
@@ -88,6 +88,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