Hello community,
here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory
checked in at 2013-05-13 20:23:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes
2013-02-04 21:15:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes
2013-05-13 20:23:19.000000000 +0200
@@ -1,0 +2,20 @@
+Fri May 10 10:40:00 UTC 2013 - bjoern.es...@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.es...@gmail.com
+
+- use SONAME from libyui instead of VERSION.cmake
+- Version 2.42.7
+
+-------------------------------------------------------------------
+Mon May 6 10:10:08 CEST 2013 - tgoettlic...@suse.de
+
+- Fixed so version
+- Version 2.42.6
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-pkg-2.42.5.tar.bz2
New:
----
libyui-qt-pkg-2.42.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.64iudH/_old 2013-05-13 20:23:20.000000000 +0200
+++ /var/tmp/diff_new_pack.64iudH/_new 2013-05-13 20:23:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-qt-pkg (Version 2.42.5)
+# spec file for package libyui-qt-pkg (Version 2.42.8)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,7 +16,7 @@
#
Name: libyui-qt-pkg-doc
-Version: 2.42.5
+Version: 2.42.8
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-qt-pkg-%{version}.tar.bz2
@@ -30,7 +30,7 @@
BuildRequires: texlive-latex
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
-BuildRequires: libyui-devel
+BuildRequires: libyui-devel >= 3.0.4
URL: http://github.com/libyui/
@@ -55,6 +55,8 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+./bootstrap.sh %{_prefix}
+
mkdir build
cd build
cmake .. \
@@ -68,7 +70,7 @@
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
-%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-qt-pkg4
+%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-qt-pkg5
%clean
@@ -77,6 +79,6 @@
%files
%defattr(-,root,root)
-%doc %{_docdir}/libyui-qt-pkg4
+%doc %{_docdir}/libyui-qt-pkg5
%changelog
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.64iudH/_old 2013-05-13 20:23:20.000000000 +0200
+++ /var/tmp/diff_new_pack.64iudH/_new 2013-05-13 20:23:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-qt-pkg (Version 2.42.5)
+# spec file for package libyui-qt-pkg (Version 2.42.8)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
Name: libyui-qt-pkg
-Version: 2.42.5
+Version: 2.42.8
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-qt-pkg-%{version}.tar.bz2
@@ -29,8 +29,9 @@
BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: libqt4-devel
+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}
@@ -43,12 +44,12 @@
component for libYUI.
-%package -n libyui-qt-pkg4
+%package -n libyui-qt-pkg5
Group: System/Libraries
-Requires: libyui4
-Provides: libyui-qt = %{version}
+Requires: libyui5
+Provides: libyui-qt-pkg = %{version}
Provides: yast2-qt-pkg = 2.42.0
Obsoletes: yast2-qt-pkg < 2.42.0
@@ -58,7 +59,7 @@
URL: http://github.com/libyui/
Summary: Libyui - Qt Package Selector
-%description -n libyui-qt-pkg4
+%description -n libyui-qt-pkg5
This package contains the Qt package selector
component for libYUI.
@@ -68,7 +69,7 @@
Group: Development/Languages/C and C++
-Requires: libyui-qt-pkg4 = %{version}
+Requires: libyui-qt-pkg5 = %{version}
Requires: %{libyui_qt_devel_version}
Requires: %{libzypp_devel_version}
@@ -93,6 +94,8 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+./bootstrap.sh %{_prefix}
+
mkdir build
cd build
@@ -116,27 +119,27 @@
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
-install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-qt-pkg4/
+install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-qt-pkg5/
install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui
-install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-qt-pkg4/
+install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-qt-pkg5/
%clean
rm -rf "$RPM_BUILD_ROOT"
-%post -n libyui-qt-pkg4 -p /sbin/ldconfig
+%post -n libyui-qt-pkg5 -p /sbin/ldconfig
-%postun -n libyui-qt-pkg4 -p /sbin/ldconfig
+%postun -n libyui-qt-pkg5 -p /sbin/ldconfig
-%files -n libyui-qt-pkg4
+%files -n libyui-qt-pkg5
%defattr(-,root,root)
%dir %{_libdir}/yui
%{_libdir}/yui/lib*.so.*
-%doc %dir %{_docdir}/libyui-qt-pkg4
-%doc %{_docdir}/libyui-qt-pkg4/COPYING*
+%doc %dir %{_docdir}/libyui-qt-pkg5
+%doc %{_docdir}/libyui-qt-pkg5/COPYING*
%files devel
%defattr(-,root,root)
-%dir %{_docdir}/libyui-qt-pkg4
+%dir %{_docdir}/libyui-qt-pkg5
%{_libdir}/yui/lib*.so
%{_prefix}/include/yui
%{_libdir}/pkgconfig/libyui-qt-pkg.pc
++++++ libyui-qt-pkg-2.42.5.tar.bz2 -> libyui-qt-pkg-2.42.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/.gitignore
new/libyui-qt-pkg-2.42.8/.gitignore
--- old/libyui-qt-pkg-2.42.5/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/libyui-qt-pkg-2.42.8/.gitignore 2013-05-10 15:39:04.000000000 +0200
@@ -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/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/CMakeLists.txt
new/libyui-qt-pkg-2.42.8/CMakeLists.txt
--- old/libyui-qt-pkg-2.42.5/CMakeLists.txt 2013-01-17 14:52:52.000000000
+0100
+++ new/libyui-qt-pkg-2.42.8/CMakeLists.txt 2013-05-13 20:23:20.000000000
+0200
@@ -1,46 +1 @@
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-
-INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" )
-
-SET( BUILDTOOLS_DIR "buildtools/" )
-
-IF( NOT PREFIX )
- SET( PREFIX "/usr" )
-ENDIF( NOT PREFIX )
-
-IF( PLUGINNAME )
- SET( BUILDTOOLS_DIR "${PREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" )
-ELSE( PLUGINNAME )
- SET( BUILDTOOLS_DIR "${CMAKE_SOURCE_DIR}/${BUILDTOOLS_DIR}" )
-ENDIF( PLUGINNAME )
-
-SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${BUILDTOOLS_DIR}"
"${CMAKE_MODULE_PATH}" )
-
-INCLUDE( LibyuiCommon )
-INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" )
-
-INITIALIZE()
-
-PROJECT( "${PROJECTNAME}" )
-ADD_DEFINITIONS(-DVERSION="${VERSION}")
-
-INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/SOURCECONF.cmake" )
-
-SET_OPTIONS()
-SET_ENVIRONMENT()
-SET_BUILD_FLAGS()
-SET_AUTODOCS()
-
-IF( NOT DOCS_ONLY )
- FIND_LIB_DEPENDENCIES()
- FIND_LINKER_LIBS()
- CHECK_PREFIX()
- SET_SUBDIRS()
- GEN_EXPORTS()
- GEN_FILES()
- PREP_SPEC_FILES()
- SET_INSTALL_TARGET()
- PREP_OBS_TARBALL()
-ENDIF( NOT DOCS_ONLY )
-
-SUMMARY()
+symbolic link to /usr/share/libyui/buildtools/CMakeLists.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/ChangeLog
new/libyui-qt-pkg-2.42.8/ChangeLog
--- old/libyui-qt-pkg-2.42.5/ChangeLog 2013-01-17 14:52:52.000000000 +0100
+++ new/libyui-qt-pkg-2.42.8/ChangeLog 2013-05-10 15:39:04.000000000 +0200
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Fri May 10 10:40:00 UTC 2013 - bjoern.es...@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.es...@gmail.com
+
+- use SONAME from libyui instead of VERSION.cmake
+- Version 2.42.7
+
+-------------------------------------------------------------------
+Mon May 6 10:10:08 CEST 2013 - tgoettlic...@suse.de
+
+- Fixed so version
+- Version 2.42.6
+
+-------------------------------------------------------------------
Thu Jan 17 14:34:22 CET 2013 - tgoettlic...@suse.de
- Fixed endcoding of entries in package history (bnc #775608)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/Makefile.cvs
new/libyui-qt-pkg-2.42.8/Makefile.cvs
--- old/libyui-qt-pkg-2.42.5/Makefile.cvs 2013-01-17 14:52:52.000000000
+0100
+++ new/libyui-qt-pkg-2.42.8/Makefile.cvs 2013-05-10 15:39:04.000000000
+0200
@@ -5,6 +5,7 @@
all: configure
configure: clean
+ ./bootstrap.sh ; \
mkdir build ; \
cd build ; \
cmake -DCMAKE_BUILD_TYPE=RELEASE ..
@@ -18,4 +19,5 @@
cmake rebuild_cache
clean:
- rm -rf build
+ rm -rf build \
+ CMakeLists.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/VERSION.cmake
new/libyui-qt-pkg-2.42.8/VERSION.cmake
--- old/libyui-qt-pkg-2.42.5/VERSION.cmake 2013-01-17 14:52:52.000000000
+0100
+++ new/libyui-qt-pkg-2.42.8/VERSION.cmake 2013-05-10 15:39:04.000000000
+0200
@@ -1,11 +1,11 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "42" )
-SET( VERSION_PATCH "5" )
+SET( VERSION_PATCH "8" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
##### These will be overridden from exports in LibyuiConfig.cmake
-SET( SONAME_MAJOR "4" )
+SET( SONAME_MAJOR "5" )
SET( SONAME_MINOR "0" )
SET( SONAME_PATCH "0" )
SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/bootstrap.sh
new/libyui-qt-pkg-2.42.8/bootstrap.sh
--- old/libyui-qt-pkg-2.42.5/bootstrap.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-qt-pkg-2.42.8/bootstrap.sh 2013-05-10 15:39:04.000000000
+0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.42.5/libyui-qt-pkg.spec.in
new/libyui-qt-pkg-2.42.8/libyui-qt-pkg.spec.in
--- old/libyui-qt-pkg-2.42.5/libyui-qt-pkg.spec.in 2013-01-17
14:52:52.000000000 +0100
+++ new/libyui-qt-pkg-2.42.8/libyui-qt-pkg.spec.in 2013-05-10
15:39:04.000000000 +0200
@@ -29,8 +29,9 @@
BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: libqt4-devel
+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}
@@ -46,7 +47,7 @@
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
@@ -87,6 +88,8 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+./bootstrap.sh %{_prefix}
+
mkdir build
cd build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
