Author: schubi2
Date: Thu Jun 26 11:59:00 2008
New Revision: 10463
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10463&view=rev
Log:
build stuff fixed
Modified:
trunk/dialogsolver/package/libqdialogsolver1.changes
trunk/dialogsolver/package/libqdialogsolver1.spec.in
trunk/dialogsolver/yast_plugin/CMakeLists.txt
trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc
Modified: trunk/dialogsolver/package/libqdialogsolver1.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/package/libqdialogsolver1.changes?rev=10463&r1=10462&r2=10463&view=diff
==============================================================================
--- trunk/dialogsolver/package/libqdialogsolver1.changes (original)
+++ trunk/dialogsolver/package/libqdialogsolver1.changes Thu Jun 26 11:59:00 2008
@@ -4,6 +4,7 @@
- Translations support added
- switched to qt4
- switched to cmake
+- added YaST plugin
- version 1.2.0
-------------------------------------------------------------------
Modified: trunk/dialogsolver/package/libqdialogsolver1.spec.in
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/package/libqdialogsolver1.spec.in?rev=10463&r1=10462&r2=10463&view=diff
==============================================================================
--- trunk/dialogsolver/package/libqdialogsolver1.spec.in (original)
+++ trunk/dialogsolver/package/libqdialogsolver1.spec.in Thu Jun 26 11:59:00 2008
@@ -19,7 +19,7 @@
Requires: libzypp >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' libzypp`) graphviz
Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++ libqt4-devel gettext-devel
+BuildRequires: gcc-c++ libqt4-devel gettext-devel cmake yast2-libyui-devel
# API Changes in zypp 2.1
@@ -75,10 +75,11 @@
%files
%defattr(-,root,root)
-%{_libdir}/libqdialogsolver*so.*
+%{_libdir}/libqdialogsolver*so*
+%{_libdir}/YaST2/plugin/libpy2qt_zypp_solver_dialog*so*
%files devel
%defattr(-,root,root)
-%dir %{_libdir}/libqdialogsolver.so
+%{_libdir}/libqdialogsolver.so
%dir /usr/include/zypp
/usr/include/zypp/*
Modified: trunk/dialogsolver/yast_plugin/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/CMakeLists.txt?rev=10463&r1=10462&r2=10463&view=diff
==============================================================================
--- trunk/dialogsolver/yast_plugin/CMakeLists.txt (original)
+++ trunk/dialogsolver/yast_plugin/CMakeLists.txt Thu Jun 26 11:59:00 2008
@@ -25,6 +25,7 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt )
INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ../src )
ADD_LIBRARY( py2qt_zypp_solver_dialog SHARED ${qt_solver_dialog_plugin_SRCS} )
TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog yui)
Modified: trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc?rev=10463&r1=10462&r2=10463&view=diff
==============================================================================
--- trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc (original)
+++ trunk/dialogsolver/yast_plugin/YQZyppSolverDialogPluginImpl.cc Thu Jun 26 11:59:00 2008
@@ -20,7 +20,7 @@
#define YUILogComponent "qt-solver-dialog"
#include