March 2014 - openSUSE Commits - openSUSE Mailing Lists

commit skelcd-control-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2014-03-01 14:38:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2014-02-01 09:40:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes 2014-03-01 14:38:14.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 27 07:24:10 UTC 2014 - mfilka(a)suse.com + +- added reference to linuxrc network configuration client +- 13.2.7 + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change Old: ---- skelcd-control-openSUSE-13.2.6.tar.bz2 New: ---- skelcd-control-openSUSE-13.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-promo.spec ++++++ --- /var/tmp/diff_new_pack.gHJsZI/_old 2014-03-01 14:38:15.000000000 +0100 +++ /var/tmp/diff_new_pack.gHJsZI/_new 2014-03-01 14:38:15.000000000 +0100 @@ -48,7 +48,7 @@ Requires: yast2-iscsi-client Requires: yast2-kdump Requires: yast2-multipath -Requires: yast2-network +Requires: yast2-network >= 3.1.24 Requires: yast2-nfs-client Requires: yast2-ntp-client Requires: yast2-proxy @@ -75,7 +75,7 @@ Url: https://github.com/yast/skelcd-control-openSUSE AutoReqProv: off -Version: 13.2.6 +Version: 13.2.7 Release: 0 Summary: The openSUSE Installation Control file License: MIT ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.gHJsZI/_old 2014-03-01 14:38:15.000000000 +0100 +++ /var/tmp/diff_new_pack.gHJsZI/_new 2014-03-01 14:38:15.000000000 +0100 @@ -48,7 +48,7 @@ Requires: yast2-iscsi-client Requires: yast2-kdump Requires: yast2-multipath -Requires: yast2-network +Requires: yast2-network >= 3.1.24 Requires: yast2-nfs-client Requires: yast2-ntp-client Requires: yast2-proxy @@ -75,7 +75,7 @@ Url: https://github.com/yast/skelcd-control-openSUSE AutoReqProv: off -Version: 13.2.6 +Version: 13.2.7 Release: 0 Summary: The openSUSE Installation Control file License: MIT ++++++ skelcd-control-openSUSE-13.2.6.tar.bz2 -> skelcd-control-openSUSE-13.2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-13.2.6/control/control.openSUSE.xml new/skelcd-control-openSUSE-13.2.7/control/control.openSUSE.xml --- old/skelcd-control-openSUSE-13.2.6/control/control.openSUSE.xml 2014-01-30 12:00:51.000000000 +0100 +++ new/skelcd-control-openSUSE-13.2.7/control/control.openSUSE.xml 2014-02-27 08:37:30.000000000 +0100 @@ -585,6 +585,10 @@ <stage>initial</stage> <modules config:type="list"> <module> + <label>Load linuxrc Network Configuration</label> + <name>install_inf</name> + </module> + <module> <label>Network Autosetup</label> <name>setup_dhcp</name> </module> @@ -730,6 +734,14 @@ <mode>live_installation</mode> <stage>initial</stage> <modules config:type="list"> + <module> + <label>Load linuxrc Network Configuration</label> + <name>install_inf</name> + </module> + <module> + <label>Network Autosetup</label> + <name>setup_dhcp</name> + </module> <module> <label>Welcome</label> <name>complex_welcome</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-13.2.6/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-13.2.7/package/skelcd-control-openSUSE.changes --- old/skelcd-control-openSUSE-13.2.6/package/skelcd-control-openSUSE.changes 2014-01-31 15:08:36.000000000 +0100 +++ new/skelcd-control-openSUSE-13.2.7/package/skelcd-control-openSUSE.changes 2014-02-27 08:37:30.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 27 07:24:10 UTC 2014 - mfilka(a)suse.com + +- added reference to linuxrc network configuration client +- 13.2.7 + +------------------------------------------------------------------- Fri Jan 31 13:39:41 UTC 2014 - lslezak(a)suse.cz - fixed package dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-13.2.6/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-13.2.7/package/skelcd-control-openSUSE.spec --- old/skelcd-control-openSUSE-13.2.6/package/skelcd-control-openSUSE.spec 2014-01-31 15:08:36.000000000 +0100 +++ new/skelcd-control-openSUSE-13.2.7/package/skelcd-control-openSUSE.spec 2014-02-27 08:37:30.000000000 +0100 @@ -47,7 +47,7 @@ Requires: yast2-iscsi-client Requires: yast2-kdump Requires: yast2-multipath -Requires: yast2-network +Requires: yast2-network >= 3.1.24 Requires: yast2-nfs-client Requires: yast2-ntp-client Requires: yast2-proxy @@ -74,7 +74,7 @@ Url: https://github.com/yast/skelcd-control-openSUSE AutoReqProv: off -Version: 13.2.6 +Version: 13.2.7 Release: 0 Summary: The openSUSE Installation Control file License: MIT -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icewm for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package icewm for openSUSE:Factory checked in at 2014-03-01 14:38:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icewm (Old) and /work/SRC/openSUSE:Factory/.icewm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icewm" Changes: -------- --- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2014-01-08 20:06:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2014-03-01 14:38:11.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 22 09:34:36 UTC 2014 - tyang(a)suse.com + +- update version to 1.3.8 +- remove patches:icewm-gcc47.patch,icewm-x11.patch +- add two new patches:icewm-1.3.8-enable-guievents.patch,icewm-susemenu.patch + for new fate #313170 + +------------------------------------------------------------------- Old: ---- icewm-1.3.7.tar.gz icewm-gcc47.patch icewm-x11.patch New: ---- icewm-1.3.8-enable-guievents.patch icewm-1.3.8.tar.gz icewm-susemenu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -41,7 +41,7 @@ Requires: xdg-menu # if you have the choice, prefer the big one Recommends: icewm-default -Version: 1.3.7 +Version: 1.3.8 Release: 0 Source: http://downloads.sourceforge.net/project/%{name}/%{name}-1.3/%{version}/%{n… Source1: %{name}.desktop @@ -53,8 +53,8 @@ Patch6: icewm-1.2.35-unaligned-access.patch Patch7: icewm-1.3.6-winoptions.patch Patch8: icewm-linking.patch -Patch9: icewm-gcc47.patch -Patch10: icewm-x11.patch +Patch9: icewm-1.3.8-enable-guievents.patch +Patch10: icewm-susemenu.patch # applied in %%build Patch99: icewm-preferences.patch Url: http://www.icewm.org/ @@ -121,7 +121,7 @@ %patch6 %patch7 -p1 %patch8 -%patch9 -p1 +%patch9 %patch10 -p1 %define lites icewm icewmhint icewmbg icesh icewm-session ++++++ icewm-1.2.35-override-config.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,18 +1,13 @@ -make icewm --config=preferences.xy work, i.e. load /etc/icewm/preferences.xy ---- - src/wmapp.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: src/wmapp.cc -=================================================================== ---- src/wmapp.cc.orig +diff --git src/wmapp.cc src/wmapp.cc +index d8b0032..24fb665 100644 +--- src/wmapp.cc +++ src/wmapp.cc -@@ -1142,7 +1142,7 @@ YWMApp::YWMApp(int *argc, char ***argv, +@@ -1178,7 +1178,7 @@ YWMApp::YWMApp(int *argc, char ***argv, const char *displayName): managerWindow = None; #ifndef NO_CONFIGURE -- loadConfiguration("preferences"); -+ loadConfiguration(configFile ? configFile : "preferences"); +- loadConfiguration(this, "preferences"); ++ loadConfiguration(this, configFile ? configFile : "preferences"); if (themeName != 0) { MSG(("themeName=%s", themeName)); ++++++ icewm-1.2.35-unaligned-access.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,14 +1,12 @@ ---- - src/wmapp.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- src/wmapp.cc.orig +diff --git src/wmapp.cc src/wmapp.cc +index d8b0032..6a5663d 100644 +--- src/wmapp.cc +++ src/wmapp.cc -@@ -218,7 +218,7 @@ static void registerProtocols2(Window xi +@@ -220,7 +220,7 @@ static void registerProtocols2(Window xid) { PropModeReplace, (unsigned char *)win_proto, i); #endif -- pid_t pid = getpid(); +- long pid = getpid(); + XID pid = getpid(); const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")"; ++++++ icewm-1.3.8-enable-guievents.patch ++++++ diff --git src/wmapp.h src/wmapp.h index 101992c..cbe2556 100644 --- src/wmapp.h +++ src/wmapp.h @@ -78,7 +78,7 @@ private: Window managerWindow; }; -#if 0 +#ifdef CONFIG_GUIEVENTS extern YWMApp * wmapp; #endif ++++++ icewm-1.3.7.tar.gz -> icewm-1.3.8.tar.gz ++++++ ++++ 7605 lines of diff (skipped) ++++++ icewm-docdir.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,11 +1,8 @@ ---- - Makefile.in | 10 +++++----- - src/Makefile.in | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- Makefile.in.orig +diff --git Makefile.in Makefile.in +index 92f76aa..54a67aa 100644 +--- Makefile.in +++ Makefile.in -@@ -116,12 +116,12 @@ install-base: base +@@ -119,12 +119,12 @@ install-base: base install-docs: docs @echo ------------------------------------------ @@ -23,7 +20,9 @@ @echo ------------------------------------------ install-nls: nls ---- src/Makefile.in.orig +diff --git src/Makefile.in src/Makefile.in +index 73f015b..46aea83 100644 +--- src/Makefile.in +++ src/Makefile.in @@ -32,7 +32,7 @@ DEFS = @DEFS@ \ -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ @@ -33,4 +32,4 @@ + -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ - @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` + @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags` ++++++ icewm-linking.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,18 +1,8 @@ ---- src/Makefile.in.orig +diff --git src/Makefile.in src/Makefile.in +index 73f015b..3f328f9 100644 +--- src/Makefile.in +++ src/Makefile.in -@@ -37,9 +37,9 @@ DEFS = @DEFS@ \ - CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \ - @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` - LFLAGS = @LDFLAGS@ --LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -+LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` - --CORE_LIBS = @CORE_LIBS@ # `fc-config --libs` -+CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs` - IMAGE_LIBS = @IMAGE_LIBS@ - AUDIO_LIBS = @AUDIO_LIBS@ - GNOME1_LIBS = @GNOME1_LIBS@ -@@ -207,29 +207,29 @@ clean: +@@ -203,25 +203,25 @@ clean: %.o: %.cc @echo " CXX " $@ @@ -36,11 +26,6 @@ ################################################################################ - gnome.o: gnome.cc - @echo " CXX " $@ -- @$(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $< -+ $(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $< - gnome2.o: gnome2.cc @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $< ++++++ icewm-menu.patch ++++++ --- /var/tmp/diff_new_pack.olW3hE/_old 2014-03-01 14:38:12.000000000 +0100 +++ /var/tmp/diff_new_pack.olW3hE/_new 2014-03-01 14:38:12.000000000 +0100 @@ -1,19 +1,9 @@ ---- lib/menu.in 2003-09-27 09:54:45.000000000 +0200 -+++ lib/menu.in 2004-03-11 22:59:14.000000000 +0100 -@@ -5,6 +5,8 @@ - # (re)install icewm. - # - prog xterm xterm xterm -+prog mlterm xterm mlterm -+prog xiterm xterm xiterm - prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500 - prog fte fte fte - prog NEdit nedit nedit -@@ -12,8 +14,4 @@ +--- lib/menu.in.orig 2014-01-06 17:58:41.735307153 +0800 ++++ lib/menu.in 2014-01-06 18:00:17.594661556 +0800 +@@ -12,7 +12,4 @@ prog XChat xchat xchat prog Gimp gimp gimp separator --menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@ -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@ -menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@ -menufile Programs folder programs ++++++ icewm-susemenu.patch ++++++ diff --git a/src/wmprog.cc b/src/wmprog.cc index 608608f..1d129a3 100644 --- a/src/wmprog.cc +++ b/src/wmprog.cc @@ -249,6 +249,14 @@ char *parseIncludeStatement(IApp *app, YSMListener *smActionListener, YActionLis return p; } +void loadMenusProg( + IApp *app, + YSMListener *smActionListener, + YActionListener *wmActionListener, + const char *command, + char *const argv[], + ObjectContainer *container); + char *parseMenus(IApp *app, YSMListener *smActionListener, YActionListener *wmActionListener, char *data, ObjectContainer *container) { char *p = data; char word[32]; @@ -415,6 +423,22 @@ char *parseMenus(IApp *app, YSMListener *smActionListener, YActionListener *wmAc delete[] name; delete[] icons; delete[] command; + } else if (!strcmp(word, "suseprog")) { + char *command; + YStringArray args; + + p = getCommandArgs(p, &command, args); + if (p == 0) { + msg(_("Error at prog %s"), "susemenu"); return p; + } + + MSG(("suseprog %s", command)); + + upath fullPath = findPath(getenv("PATH"), X_OK, command); + if (fullPath != null) { + loadMenusProg(app,smActionListener,wmActionListener,command,args.getCArray(),container); + } + delete[] command; } else if (!strcmp(word, "menuprogreload")) { char *name; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-qt-pkg for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2014-03-01 14:38:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-01-09 17:25:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes 2014-03-01 14:38:09.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 25 14:25:10 UTC 2014 - mvidner(a)suse.com + +- Ported to Qt5 +- 2.44.1 + +------------------------------------------------------------------- + +Thu Feb 13 13:49:04 UTC 2014 - mvidner(a)suse.com + +- Removed hard-coded background color for pattern headline. +- 2.43.1 + +------------------------------------------------------------------- Old: ---- libyui-qt-pkg-2.43.0.tar.bz2 New: ---- libyui-qt-pkg-2.44.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-pkg-doc.spec ++++++ --- /var/tmp/diff_new_pack.KF8v2E/_old 2014-03-01 14:38:10.000000000 +0100 +++ /var/tmp/diff_new_pack.KF8v2E/_new 2014-03-01 14:38:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt-pkg-doc -Version: 2.43.0 +Version: 2.44.1 Release: 0 Source: libyui-qt-pkg-%{version}.tar.bz2 ++++++ libyui-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.KF8v2E/_old 2014-03-01 14:38:10.000000000 +0100 +++ /var/tmp/diff_new_pack.KF8v2E/_new 2014-03-01 14:38:10.000000000 +0100 @@ -17,14 +17,16 @@ Name: libyui-qt-pkg -Version: 2.43.0 +Version: 2.44.1 Release: 0 Source: libyui-qt-pkg-%{version}.tar.bz2 BuildRequires: boost-devel BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ -BuildRequires: libqt4-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qtx11extras-devel BuildRequires: libyui-devel >= 3.0.4 BuildRequires: pkg-config ++++++ libyui-qt-pkg-2.43.0.tar.bz2 -> libyui-qt-pkg-2.44.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/CMakeLists.txt new/libyui-qt-pkg-2.44.1/CMakeLists.txt --- old/libyui-qt-pkg-2.43.0/CMakeLists.txt 2014-03-01 14:38:10.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/CMakeLists.txt 2014-03-01 14:38:10.000000000 +0100 @@ -1 +1 @@ -symbolic link to /usr/share/libyui/buildtools/CMakeLists.common +symbolic link to ../libyui-master/buildtools/CMakeLists.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/ChangeLog new/libyui-qt-pkg-2.44.1/ChangeLog --- old/libyui-qt-pkg-2.43.0/ChangeLog 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/ChangeLog 2014-02-25 15:31:12.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Feb 25 14:25:10 UTC 2014 - mvidner(a)suse.com + +- Ported to Qt5 +- 2.44.1 + +------------------------------------------------------------------- + +Thu Feb 13 13:49:04 UTC 2014 - mvidner(a)suse.com + +- Removed hard-coded background color for pattern headline. +- 2.43.1 + +------------------------------------------------------------------- Wed Jan 8 22:06:52 CET 2014 - mvidner(a)suse.com - adjusted to libyui so version 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/PROJECTINFO.cmake new/libyui-qt-pkg-2.44.1/PROJECTINFO.cmake --- old/libyui-qt-pkg-2.43.0/PROJECTINFO.cmake 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/PROJECTINFO.cmake 2014-02-21 15:09:38.000000000 +0100 @@ -6,7 +6,7 @@ SET( SUBDIRS src examples ) # set the subdirs where your code is located. SET( PLUGINNAME qt-pkg ) # define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph} -SET( LIB_DEPS Qt Zypp ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line +SET( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets Zypp ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line SET( INTERNAL_DEPS Libyui Libyui-qt ) # include libyui or it's plugins (if needed), too! SET( LIB_LINKER zypp ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! SET( EXTRA_INCLUDES ) # set include-dir which are not picked by CMake automagically here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/VERSION.cmake new/libyui-qt-pkg-2.44.1/VERSION.cmake --- old/libyui-qt-pkg-2.43.0/VERSION.cmake 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/VERSION.cmake 2014-02-25 15:31:12.000000000 +0100 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) -SET( VERSION_MINOR "43" ) -SET( VERSION_PATCH "0" ) +SET( VERSION_MINOR "44" ) +SET( VERSION_PATCH "1" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/libyui-qt-pkg.spec.in new/libyui-qt-pkg-2.44.1/libyui-qt-pkg.spec.in --- old/libyui-qt-pkg-2.43.0/libyui-qt-pkg.spec.in 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/libyui-qt-pkg.spec.in 2014-02-24 11:05:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package @PROJECTNAME@ (Version @VERSION@) +# spec file for package @PROJECTNAME@ # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,51 +11,51 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# -# norootforbuild -Name: @PROJECTNAME@ -Version: @VERSION@ -Release: 0 -License: LGPL-2.1 or LGPL-3.0 -Source: @PROJECTNAME@-%{version}.tar.bz2 -Group: System/Libraries - -BuildRequires: boost-devel -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildRequires: libqt4-devel -BuildRequires: libyui-devel >= 3.0.4 - -%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} -URL: @URL@ -Summary: @SUMMARY@ +Name: @PROJECTNAME@ +Version: @VERSION@ +Release: 0 +Source: @PROJECTNAME@-%{version}.tar.bz2 + +BuildRequires: boost-devel +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qtx11extras-devel +BuildRequires: libyui-devel >= 3.0.4 +BuildRequires: pkg-config + +%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} + +Url: @URL@ +Summary: @SUMMARY@ +License: LGPL-2.1 or LGPL-3.0 +Group: System/Libraries %description @DESCRIPTION@ %package -n @PROJECTNAME@@SONAME_MAJOR@ -Group: System/Libraries - -Requires: lib@BASELIB@@SONAME_MAJOR@ -Provides: lib@BASELIB@-qt-pkg = %{version} +Requires: lib@BASELIB@@SONAME_MAJOR@ +Provides: lib@BASELIB@-qt-pkg = %{version} -Provides: yast2-qt-pkg = 2.42.0 -Obsoletes: yast2-qt-pkg < 2.42.0 +Provides: yast2-qt-pkg = 2.42.0 +Obsoletes: yast2-qt-pkg < 2.42.0 -Provides: libyui_pkg +Provides: libyui_pkg -URL: @URL@ -Summary: @SUMMARY@ +Url: @URL@ +Summary: @SUMMARY@ +Group: System/Libraries %description -n @PROJECTNAME@@SONAME_MAJOR@ @DESCRIPTION@ @@ -63,14 +63,13 @@ %package devel -Group: Development/Languages/C and C++ - -Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version} -Requires: %{libyui_qt_devel_version} -Requires: %{libzypp_devel_version} - -URL: @URL@ -Summary: @PROJECTNAME_UC@ header files +Requires: %{libyui_qt_devel_version} +Requires: %{libzypp_devel_version} +Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version} + +Url: @URL@ +Summary: @PROJECTNAME_UC@ header files +Group: Development/Languages/C and C++ %description devel @DESCRIPTION@ @@ -82,7 +81,6 @@ %prep %setup -q -n @PROJECTNAME@-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -95,21 +93,20 @@ %if %{?_with_debug:1}%{!?_with_debug:0} cmake .. \ - -DPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO + -DPREFIX=%{_prefix} \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=RELWITHDEBINFO %else cmake .. \ - -DPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELEASE + -DPREFIX=%{_prefix} \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=RELEASE %endif make %{?jobs:-j%jobs} - %install cd build make install DESTDIR="$RPM_BUILD_ROOT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/CMakeLists.txt new/libyui-qt-pkg-2.44.1/src/CMakeLists.txt --- old/libyui-qt-pkg-2.43.0/src/CMakeLists.txt 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/CMakeLists.txt 2014-02-21 15:09:38.000000000 +0100 @@ -1,2 +1,11 @@ +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) +# Instruct CMake to run moc automatically when needed. +set(CMAKE_AUTOMOC ON) + +set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) + PROCESS_SOURCES() +qt5_use_modules( ${TARGETLIB} Core Gui Widgets Svg X11Extras ) + SUBDIRS(icons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgDescriptionView.cc new/libyui-qt-pkg-2.44.1/src/YQPkgDescriptionView.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgDescriptionView.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgDescriptionView.cc 2014-02-21 15:09:38.000000000 +0100 @@ -311,7 +311,7 @@ QString msgid = QString( "Name(%1)" ).arg( fileInfo.fileName() ); msgid += ": "; msgid += file.value( QString( "Name" )).toString(); - name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.toAscii() ) ); + name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.toLatin1() ) ); if ( name == msgid ) name = ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgDiskUsageList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgDiskUsageList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgDiskUsageList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgDiskUsageList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -116,8 +116,8 @@ sortByColumn( percentageBarCol(), Qt::DescendingOrder ); - header()->setResizeMode( nameCol(), QHeaderView::Stretch ); - header()->setResizeMode( QHeaderView::Interactive ); + header()->setSectionResizeMode( nameCol(), QHeaderView::Stretch ); + header()->setSectionResizeMode( QHeaderView::Interactive ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgLangList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgLangList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgLangList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgLangList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -73,13 +73,13 @@ headers << _( "Language"); _summaryCol = numCol++; setAllColumnsShowFocus( true ); setHeaderLabels(headers); - header()->setResizeMode( _nameCol, QHeaderView::ResizeToContents ); - header()->setResizeMode( _summaryCol, QHeaderView::Stretch ); + header()->setSectionResizeMode( _nameCol, QHeaderView::ResizeToContents ); + header()->setSectionResizeMode( _summaryCol, QHeaderView::Stretch ); setSortingEnabled( true ); header()->setSortIndicatorShown( true ); - header()->setClickable( true ); + header()->setSectionsClickable( true ); sortByColumn( nameCol(), Qt::AscendingOrder ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -110,13 +110,13 @@ setHeaderLabels( headers ); header()->setSortIndicatorShown( true ); - header()->setClickable( true ); + header()->setSectionsClickable( true ); sortByColumn( statusCol(), Qt::AscendingOrder ); setAllColumnsShowFocus( true ); setIconSize( QSize( 22, 16 ) ); - header()->setResizeMode( QHeaderView::Interactive ); + header()->setSectionResizeMode( QHeaderView::Interactive ); /* NOTE: resizeEvent() is automatically triggered afterwards => sets initial column widths */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgObjList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgObjList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgObjList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgObjList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -661,7 +661,7 @@ { if ( event ) { - int special_combo = ( Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier ); + Qt::KeyboardModifiers special_combo = ( Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier ); if ( ( event->modifiers() & special_combo ) == special_combo ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgPatchList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgPatchList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgPatchList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgPatchList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -127,10 +127,10 @@ setHeaderLabels(headers); setIndentation(0); - header()->setResizeMode(_statusCol, QHeaderView::ResizeToContents); - //header()->setResizeMode(_versionCol, QHeaderView::ResizeToContents); - //header()->setResizeMode(_categoryCol, QHeaderView::ResizeToContents); - header()->setResizeMode(_summaryCol, QHeaderView::Stretch); + header()->setSectionResizeMode(_statusCol, QHeaderView::ResizeToContents); + //header()->setSectionResizeMode(_versionCol, QHeaderView::ResizeToContents); + //header()->setSectionResizeMode(_categoryCol, QHeaderView::ResizeToContents); + header()->setSectionResizeMode(_summaryCol, QHeaderView::Stretch); setItemDelegateForColumn( _summaryCol, new YQPkgPatchItemDelegate( this ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgPatternList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgPatternList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgPatternList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgPatternList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -197,9 +197,9 @@ setAllColumnsShowFocus( true ); - header()->setResizeMode( statusCol(), QHeaderView::Fixed ); - header()->setResizeMode( summaryCol(), QHeaderView::Stretch ); - header()->setResizeMode( howmanyCol(), QHeaderView::Fixed ); + header()->setSectionResizeMode( statusCol(), QHeaderView::Fixed ); + header()->setSectionResizeMode( summaryCol(), QHeaderView::Stretch ); + header()->setSectionResizeMode( howmanyCol(), QHeaderView::Fixed ); header()->resizeSection( statusCol(), 25 ); setColumnWidth( statusCol(), 25 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgProductDialog.cc new/libyui-qt-pkg-2.44.1/src/YQPkgProductDialog.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgProductDialog.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgProductDialog.cc 2014-02-21 15:09:38.000000000 +0100 @@ -43,7 +43,7 @@ #include "YUILog.h" #include <QApplication> -#include <QtGui/qdesktopwidget.h> +#include <qdesktopwidget.h> #include <QHBoxLayout> #include <QLabel> #include <QLayout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgRepoList.cc new/libyui-qt-pkg-2.44.1/src/YQPkgRepoList.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgRepoList.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgRepoList.cc 2014-02-21 15:09:38.000000000 +0100 @@ -77,7 +77,7 @@ // headers << _( "URL"); _urlCol = numCol++; setHeaderLabels( headers ); - header()->setResizeMode( _nameCol, QHeaderView::Stretch ); + header()->setSectionResizeMode( _nameCol, QHeaderView::Stretch ); //setAllColumnsShowFocus( true ); setSelectionMode( QAbstractItemView::ExtendedSelection ); // allow multi-selection with Ctrl-mouse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQPkgSelDescriptionView.cc new/libyui-qt-pkg-2.44.1/src/YQPkgSelDescriptionView.cc --- old/libyui-qt-pkg-2.43.0/src/YQPkgSelDescriptionView.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQPkgSelDescriptionView.cc 2014-02-21 15:09:38.000000000 +0100 @@ -155,14 +155,7 @@ } - QString html = "<table width='100%'"; - - if ( ! YQUI::ui()->usingVisionImpairedPalette() ) - html += " bgcolor='" - + QApplication::palette().color( QPalette::Active, QPalette::Base).name() - + "'"; - - html += "><tr><td>" + QString html = "<table width='100%'><tr><td>" + ( useBigFont ? QString( "<h2>" ) : QString( "<b>" ) ) + summary + ( useBigFont ? QString( "</h2>" ) : QString( "</b>" ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-pkg-2.43.0/src/YQSimplePatchSelector.cc new/libyui-qt-pkg-2.44.1/src/YQSimplePatchSelector.cc --- old/libyui-qt-pkg-2.43.0/src/YQSimplePatchSelector.cc 2014-01-08 23:05:00.000000000 +0100 +++ new/libyui-qt-pkg-2.44.1/src/YQSimplePatchSelector.cc 2014-02-21 15:09:38.000000000 +0100 @@ -160,7 +160,7 @@ Q_CHECK_PTR( _diskUsageList ); layout->addWidget(_diskUsageList); - splitter->setResizeMode( lower_vbox, QSplitter::FollowSizeHint ); + splitter->setSectionResizeMode( lower_vbox, QSplitter::FollowSizeHint ); #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-qt-graph for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package libyui-qt-graph for openSUSE:Factory checked in at 2014-03-01 14:38:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-graph (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-graph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt-graph" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-graph/libyui-qt-graph.changes 2014-01-23 15:48:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-graph.new/libyui-qt-graph.changes 2014-03-01 14:38:08.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 25 14:46:20 UTC 2014 - mvidner(a)suse.com + +- merged git and Factory state: the patch is now upstreamed: + 0001-use-cgraph-instead-of-graph-interfaces.patch +- Ported to Qt5 +- 2.44.1 + +------------------------------------------------------------------- Old: ---- 0001-use-cgraph-instead-of-graph-interfaces.patch libyui-qt-graph-2.43.0.tar.bz2 New: ---- libyui-qt-graph-2.44.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-graph-doc.spec ++++++ --- /var/tmp/diff_new_pack.jkBcq8/_old 2014-03-01 14:38:09.000000000 +0100 +++ /var/tmp/diff_new_pack.jkBcq8/_new 2014-03-01 14:38:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-qt-graph-doc -Version: 2.43.0 +Version: 2.44.1 Release: 0 Source: libyui-qt-graph-%{version}.tar.bz2 ++++++ libyui-qt-graph.spec ++++++ --- /var/tmp/diff_new_pack.jkBcq8/_old 2014-03-01 14:38:09.000000000 +0100 +++ /var/tmp/diff_new_pack.jkBcq8/_new 2014-03-01 14:38:09.000000000 +0100 @@ -17,15 +17,16 @@ Name: libyui-qt-graph -Version: 2.43.0 +Version: 2.44.1 Release: 0 Source: libyui-qt-graph-%{version}.tar.bz2 -Patch: 0001-use-cgraph-instead-of-graph-interfaces.patch BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: graphviz-devel >= 2.26.0 -BuildRequires: libqt4-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qtx11extras-devel BuildRequires: libyui-devel >= 3.0.4 %define libyui_qt_devel_version libyui-qt-devel >= 2.42.0 @@ -80,7 +81,6 @@ %prep %setup -q -n libyui-qt-graph-%{version} -%patch -p1 %build ++++++ libyui-qt-graph-2.43.0.tar.bz2 -> libyui-qt-graph-2.44.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/CMakeLists.txt new/libyui-qt-graph-2.44.1/CMakeLists.txt --- old/libyui-qt-graph-2.43.0/CMakeLists.txt 2014-03-01 14:38:09.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/CMakeLists.txt 2014-03-01 14:38:09.000000000 +0100 @@ -1 +1 @@ -symbolic link to /usr/share/libyui/buildtools/CMakeLists.common +symbolic link to ../libyui-master/buildtools/CMakeLists.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/ChangeLog new/libyui-qt-graph-2.44.1/ChangeLog --- old/libyui-qt-graph-2.43.0/ChangeLog 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/ChangeLog 2014-02-25 16:08:58.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Feb 25 14:46:20 UTC 2014 - mvidner(a)suse.com + +- merged git and Factory state: the patch is now upstreamed: + 0001-use-cgraph-instead-of-graph-interfaces.patch +- Ported to Qt5 +- 2.44.1 + +------------------------------------------------------------------- +Mon Jan 13 16:48:36 CET 2014 - mvidner(a)suse.com + +- use cgraph interfaces if available, to fix building with + graphviz 2.30 (dvaleev) + 0001-use-cgraph-instead-of-graph-interfaces.patch + +------------------------------------------------------------------- Wed Jan 8 13:34:40 CET 2014 - mvidner(a)suse.com - adjusted to libyui so version 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/PROJECTINFO.cmake new/libyui-qt-graph-2.44.1/PROJECTINFO.cmake --- old/libyui-qt-graph-2.43.0/PROJECTINFO.cmake 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/PROJECTINFO.cmake 2014-02-21 15:14:45.000000000 +0100 @@ -6,7 +6,7 @@ SET( SUBDIRS src examples ) # set the subdirs where your code is located. SET( PLUGINNAME qt-graph ) # define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph} -SET( LIB_DEPS Qt ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line +SET( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line SET( INTERNAL_DEPS Libyui Libyui-qt ) # include libyui or it's plugins (if needed), too! #SET( LIB_LINKER gvc graph cdt) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! SET( EXTRA_INCLUDES /usr/include/graphviz ) # set include-dir which are not picked by CMake automagically here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/VERSION.cmake new/libyui-qt-graph-2.44.1/VERSION.cmake --- old/libyui-qt-graph-2.43.0/VERSION.cmake 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/VERSION.cmake 2014-02-21 15:14:45.000000000 +0100 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "43") -SET(VERSION_PATCH "0") +SET(VERSION_MINOR "44") +SET(VERSION_PATCH "1") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/examples/SimpleCreate.cc new/libyui-qt-graph-2.44.1/examples/SimpleCreate.cc --- old/libyui-qt-graph-2.43.0/examples/SimpleCreate.cc 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/examples/SimpleCreate.cc 2014-02-21 15:14:45.000000000 +0100 @@ -45,6 +45,23 @@ GVC_t* gvc = gvContext(); +#ifdef WITH_CGRAPH + graph_t* graph = agopen(strdup("test"), Agdirected, 0); + + node_t* node1 = agnode(graph, strdup("1"), 1); + node_t* node2 = agnode(graph, strdup("2"), 1); + + agattr(graph, AGNODE, strdup("fillcolor"), strdup("gray")); + agset(node1, strdup("fillcolor"), strdup("red")); + agset(node2, strdup("fillcolor"), strdup("green")); + + edge_t* edge1 = agedge(graph, node1, node2, NULL, 1); + edge_t* edge2 = agedge(graph, node2, node1, NULL, 1); + + agattr(graph, AGEDGE, strdup("color"), strdup("black")); + agset(edge1, strdup("color"), strdup("red")); + agset(edge2, strdup("color"), strdup("green")); +#else graph_t* graph = agopen(strdup("test"), AGDIGRAPH); node_t* node1 = agnode(graph, strdup("1")); @@ -60,6 +77,7 @@ agedgeattr(graph, strdup("color"), strdup("black")); agset(edge1, strdup("color"), strdup("red")); agset(edge2, strdup("color"), strdup("green")); +#endif gvLayout(gvc, graph, "dot"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/libyui-qt-graph.spec.in new/libyui-qt-graph-2.44.1/libyui-qt-graph.spec.in --- old/libyui-qt-graph-2.43.0/libyui-qt-graph.spec.in 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/libyui-qt-graph.spec.in 2014-02-24 11:13:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package @PROJECTNAME@ (Version @VERSION@) +# spec file for package @PROJECTNAME@ # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,46 +11,47 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: @PROJECTNAME@ -Version: @VERSION@ -Release: 0 -License: LGPL-2.1 or LGPL-3.0 -Source: @PROJECTNAME@-%{version}.tar.bz2 -Group: System/Libraries -BuildRequires: cmake >= 2.8 +Name: @PROJECTNAME@ +Version: @VERSION@ +Release: 0 +Source: @PROJECTNAME@-%{version}.tar.bz2 + +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: graphviz-devel >= 2.26.0 -BuildRequires: libqt4-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qtx11extras-devel BuildRequires: libyui-devel >= 3.0.4 +%define libyui_qt_devel_version libyui-qt-devel >= 2.42.0 +BuildRequires: %{libyui_qt_devel_version} -%define libyui_qt_devel_version libyui-qt-devel >= 2.42.0 -BuildRequires: %{libyui_qt_devel_version} - -URL: @URL@ -Summary: @SUMMARY@ +Url: @URL@ +Summary: @SUMMARY@ +License: LGPL-2.1 or LGPL-3.0 +Group: System/Libraries %description @DESCRIPTION@ %package -n @PROJECTNAME@@SONAME_MAJOR@ -Group: System/Libraries - -Requires: lib@BASELIB@@SONAME_MAJOR@ -Supplements: lib@BASELIB@-qt@SONAME_MAJOR@ -Provides: lib@BASELIB@-qt-graph = %{version} - -Provides: yast2-qt-graph = 2.42.0 -Obsoletes: yast2-qt-graph < 2.42.0 - -URL: @URL@ -Summary: @SUMMARY@ +Requires: lib@BASELIB@@SONAME_MAJOR@ +Supplements: lib@BASELIB@-qt@SONAME_MAJOR@ +Provides: lib@BASELIB@-qt-graph = %{version} + +Provides: yast2-qt-graph = 2.42.0 +Obsoletes: yast2-qt-graph < 2.42.0 + +Url: @URL@ +Summary: @SUMMARY@ +Group: System/Libraries %description -n @PROJECTNAME@@SONAME_MAJOR@ @DESCRIPTION@ @@ -58,13 +59,12 @@ %package devel -Group: Development/Languages/C and C++ - -Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version} -Requires: %{libyui_qt_devel_version} +Requires: %{libyui_qt_devel_version} +Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version} -URL: @URL@ -Summary: @PROJECTNAME_UC@ header files +Url: @URL@ +Summary: @PROJECTNAME_UC@ header files +Group: Development/Languages/C and C++ %description devel @DESCRIPTION@ @@ -76,7 +76,6 @@ %prep %setup -q -n @PROJECTNAME@-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -89,21 +88,20 @@ %if %{?_with_debug:1}%{!?_with_debug:0} cmake .. \ - -DPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO + -DPREFIX=%{_prefix} \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=RELWITHDEBINFO %else cmake .. \ - -DPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELEASE + -DPREFIX=%{_prefix} \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=RELEASE %endif make %{?jobs:-j%jobs} - %install cd build make install DESTDIR="$RPM_BUILD_ROOT" @@ -134,5 +132,4 @@ %{_libdir}/cmake/@PROJECTNAME@ %doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@/examples - %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/src/CMakeLists.txt new/libyui-qt-graph-2.44.1/src/CMakeLists.txt --- old/libyui-qt-graph-2.43.0/src/CMakeLists.txt 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/src/CMakeLists.txt 2014-02-21 15:14:45.000000000 +0100 @@ -1 +1,9 @@ +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) +# Instruct CMake to run moc automatically when needed. +set(CMAKE_AUTOMOC ON) + +set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) + PROCESS_SOURCES() +qt5_use_modules( ${TARGETLIB} Core Gui Widgets Svg X11Extras ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.43.0/src/QY2Graph.cc new/libyui-qt-graph-2.44.1/src/QY2Graph.cc --- old/libyui-qt-graph-2.43.0/src/QY2Graph.cc 2014-01-08 14:31:49.000000000 +0100 +++ new/libyui-qt-graph-2.44.1/src/QY2Graph.cc 2014-02-21 15:14:45.000000000 +0100 @@ -108,7 +108,7 @@ void QY2Graph::scaleView(qreal scaleFactor) { - qreal f = sqrt(matrix().det()); + qreal f = sqrt(matrix().determinant()); if (scaleFactor * f > 8.0) scaleFactor = 8.0 / f; @@ -224,7 +224,11 @@ GVC_t* gvc = gvContext(); if (gvc != NULL) { +#ifdef WITH_CGRAPH + graph_t* graph = agread(fp, NULL); +#else graph_t* graph = agread(fp); +#endif if (graph != NULL) { if (gvLayout(gvc, graph, const_cast<char*>(layoutAlgorithm.c_str())) == 0) @@ -375,7 +379,11 @@ drawLabel(ND_label(node), &painter); painter.end(); +#ifdef WITH_CGRAPH + QY2Node* item = new QY2Node(makeShape(node), picture, agnameof(node)); +#else QY2Node* item = new QY2Node(makeShape(node), picture, node->name); +#endif item->setPos(gToQ(ND_coord(node))); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-qt for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2014-03-01 14:38:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2014-01-09 17:25:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2014-03-01 14:38:05.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Feb 27 14:59:54 UTC 2014 - mvidner(a)suse.com + +- Fixed save_y2logs invocation (bnc#866056). +- 2.45.2 + +------------------------------------------------------------------- +Fri Feb 21 17:06:15 UTC 2014 - mvidner(a)suse.com + +- fontconfig-devel has been a build dependency; something has + stopped pulling it in for us +- 2.45.1 + +------------------------------------------------------------------- +Tue Jan 7 12:50:04 UTC 2014 - mvidner(a)suse.com + +- Ported to Qt5 +- 2.45.0 + +------------------------------------------------------------------- Old: ---- libyui-qt-2.44.0.tar.bz2 New: ---- libyui-qt-2.45.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.VpLY6F/_old 2014-03-01 14:38:06.000000000 +0100 +++ /var/tmp/diff_new_pack.VpLY6F/_new 2014-03-01 14:38:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libyui-qt-doc -Version: 2.44.0 +Version: 2.45.2 Release: 0 Source: libyui-qt-%{version}.tar.bz2 ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.VpLY6F/_old 2014-03-01 14:38:06.000000000 +0100 +++ /var/tmp/diff_new_pack.VpLY6F/_new 2014-03-01 14:38:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libyui-qt -Version: 2.44.0 +Version: 2.45.2 Release: 0 Source: libyui-qt-%{version}.tar.bz2 @@ -28,7 +28,10 @@ %define libyui_devel_version libyui-devel >= 3.0.4 BuildRequires: %{libyui_devel_version} -BuildRequires: libqt4-devel +BuildRequires: fontconfig-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qtx11extras-devel Provides: yui_backend = 6 Url: http://github.com/libyui/ @@ -61,6 +64,7 @@ %package devel Requires: %{libyui_devel_version} +Requires: fontconfig-devel Requires: libyui-qt6 = %{version} Url: http://github.com/libyui/ ++++++ libyui-qt-2.44.0.tar.bz2 -> libyui-qt-2.45.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/CMakeLists.txt new/libyui-qt-2.45.2/CMakeLists.txt --- old/libyui-qt-2.44.0/CMakeLists.txt 2014-03-01 14:38:06.000000000 +0100 +++ new/libyui-qt-2.45.2/CMakeLists.txt 2014-03-01 14:38:06.000000000 +0100 @@ -1 +1 @@ -symbolic link to /usr/share/libyui/buildtools/CMakeLists.common +symbolic link to ../libyui-master/buildtools/CMakeLists.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/ChangeLog new/libyui-qt-2.45.2/ChangeLog --- old/libyui-qt-2.44.0/ChangeLog 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/ChangeLog 2014-02-27 16:25:40.000000000 +0100 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Thu Feb 27 14:59:54 UTC 2014 - mvidner(a)suse.com + +- Fixed save_y2logs invocation (bnc#866056). +- 2.45.2 + +------------------------------------------------------------------- +Fri Feb 21 17:06:15 UTC 2014 - mvidner(a)suse.com + +- fontconfig-devel has been a build dependency; something has + stopped pulling it in for us +- 2.45.1 + +------------------------------------------------------------------- +Tue Jan 7 12:50:04 UTC 2014 - mvidner(a)suse.com + +- Ported to Qt5 +- 2.45.0 + +------------------------------------------------------------------- Thu Dec 5 16:36:33 UTC 2013 - mvidner(a)suse.com - adjusted to libyui so version 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/PROJECTINFO.cmake new/libyui-qt-2.45.2/PROJECTINFO.cmake --- old/libyui-qt-2.44.0/PROJECTINFO.cmake 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/PROJECTINFO.cmake 2014-02-21 15:05:58.000000000 +0100 @@ -6,9 +6,9 @@ SET( SUBDIRS src ) # set the subdirs where your code is located. SET( PLUGINNAME "qt" ) # define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph} -SET( LIB_DEPS Qt) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line +SET( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets Qt5Svg Qt5X11Extras) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line SET( INTERNAL_DEPS Libyui ) # include libyui or it's plugins (if needed), too! -SET( LIB_LINKER QtCore QtGui X11 fontconfig dl pthread ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! +SET( LIB_LINKER X11 fontconfig dl pthread ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! #SET( EXTRA_INCLUDES ) # set include-dir which are not picked by CMake automagically here. SET( PROGSUBDIR "" ) # define your programm's name if the plugin is made for it, only. e.g. "YaST2" for {gtk,ncurses,qt}-pkg. SET( URL "http://github.com/libyui/" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/VERSION.cmake new/libyui-qt-2.45.2/VERSION.cmake --- old/libyui-qt-2.44.0/VERSION.cmake 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/VERSION.cmake 2014-02-27 16:25:40.000000000 +0100 @@ -1,6 +1,6 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "44") -SET(VERSION_PATCH "0") +SET(VERSION_MINOR "45") +SET(VERSION_PATCH "2") SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/libyui-qt.spec.in new/libyui-qt-2.45.2/libyui-qt.spec.in --- old/libyui-qt-2.44.0/libyui-qt.spec.in 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/libyui-qt.spec.in 2014-02-24 11:09:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package @PROJECTNAME@ (Version @VERSION@) +# spec file for package @PROJECTNAME@ # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,46 +11,47 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# -# norootforbuild -Name: @PROJECTNAME@ -Version: @VERSION@ -Release: 0 -License: LGPL-2.1 or LGPL-3.0 -Source: @PROJECTNAME@-%{version}.tar.bz2 -Group: System/Libraries - -BuildRequires: boost-devel -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 3.0.4 -BuildRequires: %{libyui_devel_version} -BuildRequires: libqt4-devel -Provides: yui_backend = @SONAME_MAJOR@ +Name: @PROJECTNAME@ +Version: @VERSION@ +Release: 0 +Source: @PROJECTNAME@-%{version}.tar.bz2 + +BuildRequires: boost-devel +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkg-config -URL: @URL@ -Summary: @SUMMARY@ +%define libyui_devel_version libyui-devel >= 3.0.4 +BuildRequires: %{libyui_devel_version} +BuildRequires: fontconfig-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +BuildRequires: libqt5-qtx11extras-devel +Provides: yui_backend = @SONAME_MAJOR@ + +Url: @URL@ +Summary: @SUMMARY@ +License: LGPL-2.1 or LGPL-3.0 +Group: System/Libraries %description @DESCRIPTION@ %package -n @PROJECTNAME@@SONAME_MAJOR@ -Group: System/Libraries - -Requires: lib@BASELIB@@SONAME_MAJOR@ -Provides: lib@BASELIB@-qt = %{version} -Provides: yast2-qt = %{version} -Obsoletes: yast2-qt < 2.42.0 - -URL: @URL@ -Summary: @SUMMARY@ +Requires: lib@BASELIB@@SONAME_MAJOR@ +Provides: lib@BASELIB@-qt = %{version} +Provides: yast2-qt = %{version} +Obsoletes: yast2-qt < 2.42.0 + +Url: @URL@ +Summary: @SUMMARY@ +Group: System/Libraries %description -n @PROJECTNAME@@SONAME_MAJOR@ @DESCRIPTION@ @@ -58,13 +59,13 @@ %package devel -Group: Development/Languages/C and C++ - -Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version} -Requires: %{libyui_devel_version} - -URL: @URL@ -Summary: @PROJECTNAME_UC@ header files +Requires: %{libyui_devel_version} +Requires: fontconfig-devel +Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version} + +Url: @URL@ +Summary: @PROJECTNAME_UC@ header files +Group: Development/Languages/C and C++ %description devel @DESCRIPTION@ @@ -76,7 +77,6 @@ %prep %setup -q -n @PROJECTNAME@-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -89,21 +89,20 @@ %if %{?_with_debug:1}%{!?_with_debug:0} cmake .. \ - -DPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO + -DPREFIX=%{_prefix} \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=RELWITHDEBINFO %else cmake .. \ - -DPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELEASE + -DPREFIX=%{_prefix} \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DCMAKE_BUILD_TYPE=RELEASE %endif make %{?jobs:-j%jobs} - %install cd build make install DESTDIR="$RPM_BUILD_ROOT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/CMakeLists.txt new/libyui-qt-2.45.2/src/CMakeLists.txt --- old/libyui-qt-2.44.0/src/CMakeLists.txt 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/CMakeLists.txt 2014-02-21 15:05:58.000000000 +0100 @@ -1,2 +1,17 @@ -PROCESS_SOURCES() +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) +# Instruct CMake to run moc automatically when needed. +set(CMAKE_AUTOMOC ON) + +set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) +set(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) +add_definitions( + -DICONDIR="${Y2QT_ICONDIR}" + -DQT_LOCALEDIR="${QT_TRANSLATIONS_DIR}" + -DQTLIBDIR="${QT_LIBRARY_DIR}" + ) +qt5_wrap_ui(${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}") + +PROCESS_SOURCES() +qt5_use_modules( ${TARGETLIB} Core Gui Widgets Svg X11Extras ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2ComboTabWidget.h new/libyui-qt-2.45.2/src/QY2ComboTabWidget.h --- old/libyui-qt-2.44.0/src/QY2ComboTabWidget.h 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/QY2ComboTabWidget.h 2014-02-21 15:05:58.000000000 +0100 @@ -30,6 +30,7 @@ #include <QString> #include <QHash> +#include <QWidget> class QComboBox; class QLabel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2DiskUsageList.cc new/libyui-qt-2.45.2/src/QY2DiskUsageList.cc --- old/libyui-qt-2.44.0/src/QY2DiskUsageList.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/QY2DiskUsageList.cc 2014-02-21 15:05:58.000000000 +0100 @@ -195,7 +195,7 @@ setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); } - textdomain(savedtextdomain.toAscii()); + textdomain(savedtextdomain.toLatin1()); saveColumnWidths(); setSelectionMode(QAbstractItemView::NoSelection); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2DiskUsageList.h new/libyui-qt-2.45.2/src/QY2DiskUsageList.h --- old/libyui-qt-2.44.0/src/QY2DiskUsageList.h 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/QY2DiskUsageList.h 2014-02-21 15:05:58.000000000 +0100 @@ -218,17 +218,6 @@ **/ void init( bool allFields ); - /** - * Paint method. - * - * Reimplemented from QY2ListViewItem. - **/ - /*virtual void paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ); - */ public: /** * Paint a percentage bar into a @ref QListViewItem cell. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2ListView.cc new/libyui-qt-2.45.2/src/QY2ListView.cc --- old/libyui-qt-2.44.0/src/QY2ListView.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/QY2ListView.cc 2014-02-21 15:05:58.000000000 +0100 @@ -224,7 +224,7 @@ { _mousePressedItem = 0; _mousePressedCol = -1; - _mousePressedButton = -1; + _mousePressedButton = Qt::NoButton; } // Call base class method @@ -355,7 +355,7 @@ { _sortByInsertionSequence = sortByInsertionSequence; //FIXME sort(); - header()->setClickable( ! _sortByInsertionSequence ); + header()->setSectionsClickable( ! _sortByInsertionSequence ); } @@ -474,24 +474,6 @@ -#if FIXME_ITEM_COLORS -void -QY2CheckListItem::paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ) -{ - QColorGroup cg = colorGroup; - - if ( _textColor.isValid() ) cg.setColor( QColorGroup::Text, _textColor ); - if ( _backgroundColor.isValid() ) cg.setColor( QColorGroup::Base, _backgroundColor ); - - QTreeWidgetItem::paintCell( painter, cg, column, width, alignment ); -} -#endif - - #if FIXME_TOOLTIP void QY2ListViewToolTip::maybeTip( const QPoint & pos ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2ListView.h new/libyui-qt-2.45.2/src/QY2ListView.h --- old/libyui-qt-2.44.0/src/QY2ListView.h 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/QY2ListView.h 2014-02-21 15:05:58.000000000 +0100 @@ -214,7 +214,7 @@ QTreeWidgetItem * _mousePressedItem; int _mousePressedCol; - int _mousePressedButton; + Qt::MouseButton _mousePressedButton; std::vector<int> _savedColumnWidth; bool _sortByInsertionSequence; @@ -291,19 +291,6 @@ protected: - /** - * Paint method. Reimplemented from @ref QTreeWidgetItem so different - * colors can be used. - * - * Reimplemented from QTreeWidgetItem. - **/ - /* - virtual void paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ); - */ // // Data members // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQApplication.h new/libyui-qt-2.45.2/src/YQApplication.h --- old/libyui-qt-2.44.0/src/YQApplication.h 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQApplication.h 2014-02-21 15:05:58.000000000 +0100 @@ -26,8 +26,8 @@ #ifndef YQApplication_h #define YQApplication_h -#include <Qt/qobject.h> -#include <Qt/qtranslator.h> +#include <qobject.h> +#include <qtranslator.h> #include <qfont.h> #include "YQPackageSelectorPluginStub.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQInputField.h new/libyui-qt-2.45.2/src/YQInputField.h --- old/libyui-qt-2.44.0/src/YQInputField.h 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQInputField.h 2014-02-21 15:05:58.000000000 +0100 @@ -31,6 +31,7 @@ #include <yui/YInputField.h> +typedef union _XEvent XEvent; class QString; class QY2CharValidator; class YQWidgetCaption; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQMultiSelectionBox.h new/libyui-qt-2.45.2/src/YQMultiSelectionBox.h --- old/libyui-qt-2.44.0/src/YQMultiSelectionBox.h 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQMultiSelectionBox.h 2014-02-21 15:05:58.000000000 +0100 @@ -27,7 +27,6 @@ #define YQMultiSelectionBox_h #include <QFrame> -#include <QColorGroup> #include <QTreeWidget> #include <yui/YMultiSelectionBox.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQRichText.cc new/libyui-qt-2.45.2/src/YQRichText.cc --- old/libyui-qt-2.44.0/src/YQRichText.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQRichText.cc 2014-02-21 15:05:58.000000000 +0100 @@ -25,7 +25,6 @@ #define YUILogComponent "qt-ui" #include <yui/YUILog.h> -#include <QColorGroup> #include <QScrollBar> #include <QRegExp> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQTable.cc new/libyui-qt-2.45.2/src/YQTable.cc --- old/libyui-qt-2.44.0/src/YQTable.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQTable.cc 2014-02-21 15:05:58.000000000 +0100 @@ -77,7 +77,7 @@ } _qt_listView->setHeaderLabels( headers ); - _qt_listView->header()->setResizeMode( QHeaderView::Interactive ); + _qt_listView->header()->setSectionResizeMode( QHeaderView::Interactive ); _qt_listView->sortItems( 0, Qt::AscendingOrder); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQTree.cc new/libyui-qt-2.45.2/src/YQTree.cc --- old/libyui-qt-2.44.0/src/YQTree.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQTree.cc 2014-02-21 15:05:58.000000000 +0100 @@ -22,7 +22,6 @@ /-*/ -#include <QColorGroup> #include <QHeaderView> #include <QLabel> #include <QTreeWidget> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQUI.cc new/libyui-qt-2.45.2/src/YQUI.cc --- old/libyui-qt-2.44.0/src/YQUI.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQUI.cc 2014-02-21 15:05:58.000000000 +0100 @@ -35,6 +35,7 @@ #include <QEvent> #include <QCursor> #include <QLocale> +#include <QMessageLogContext> #define YUILogComponent "qt-ui" @@ -70,7 +71,7 @@ -static void qMessageHandler( QtMsgType type, const char * msg ); +static void qMessageHandler( QtMsgType type, const QMessageLogContext &, const QString & msg ); YQUI * YQUI::_ui = 0; @@ -107,7 +108,7 @@ screenShotNameTemplate = ""; _blockedLevel = 0; - qInstallMsgHandler( qMessageHandler ); + qInstallMessageHandler( qMessageHandler ); yuiDebug() << "YQUI constructor finished" << std::endl; @@ -703,7 +704,7 @@ static void -qMessageHandler( QtMsgType type, const char * msg ) +qMessageHandler( QtMsgType type, const QMessageLogContext &, const QString & msg ) { switch (type) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQUI_builtins.cc new/libyui-qt-2.45.2/src/YQUI_builtins.cc --- old/libyui-qt-2.44.0/src/YQUI_builtins.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQUI_builtins.cc 2014-02-27 16:25:40.000000000 +0100 @@ -217,9 +217,9 @@ if ( ! fileName.isEmpty() ) { - QString saveLogsCommand = "/sbin/save_y2logs"; + QString saveLogsCommand = "/usr/sbin/save_y2logs"; - if ( access( saveLogsCommand.toAscii(), X_OK ) == 0 ) + if ( access( saveLogsCommand.toLatin1(), X_OK ) == 0 ) { saveLogsCommand += " '" + fileName + "'"; yuiMilestone() << "Saving y2logs: " << saveLogsCommand << std::endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQWidgetFactory.cc new/libyui-qt-2.45.2/src/YQWidgetFactory.cc --- old/libyui-qt-2.44.0/src/YQWidgetFactory.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQWidgetFactory.cc 2014-02-21 15:05:58.000000000 +0100 @@ -22,7 +22,6 @@ /-*/ -#include <QColorGroup> #define YUILogComponent "qt-ui" #include <yui/YUILog.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQWizard.cc new/libyui-qt-2.45.2/src/YQWizard.cc --- old/libyui-qt-2.44.0/src/YQWizard.cc 2013-12-11 11:44:33.000000000 +0100 +++ new/libyui-qt-2.45.2/src/YQWizard.cc 2014-02-21 15:05:58.000000000 +0100 @@ -39,7 +39,6 @@ #include <qlabel.h> #include <qlayout.h> #include <qmenubar.h> -#include <qmenudata.h> #include <qobject.h> #include <qpixmap.h> #include <qpushbutton.h> @@ -556,7 +555,7 @@ vbox->addWidget( _tree ); _tree->header()->hide(); - _tree->header()->setResizeMode( 0, QHeaderView::Stretch ); + _tree->header()->setSectionResizeMode( 0, QHeaderView::Stretch ); _tree->setRootIsDecorated( true ); _tree->setSortByInsertionSequence( true ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Test-DVD-x86_64 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package Test-DVD-x86_64 for openSUSE:Factory checked in at 2014-03-01 13:17:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Test-DVD-x86_64 (Old) and /work/SRC/openSUSE:Factory/.Test-DVD-x86_64.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Test-DVD-x86_64" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PRODUCT-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.htd3Vg/_old 2014-03-01 13:17:24.000000000 +0100 +++ /var/tmp/diff_new_pack.htd3Vg/_new 2014-03-01 13:17:24.000000000 +0100 @@ -23,7 +23,7 @@ <productoptions> <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">dvd</productvar> - <productvar name="MEDIUM_NAME">Test-77</productvar> + <productvar name="MEDIUM_NAME">Test-78</productvar> <productvar name="MULTIPLE_MEDIA">no</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -76,7 +76,6 @@ <repopackage name="bash-lang"/> <repopackage name="bind-libs"/> <repopackage name="bind-utils"/> - <repopackage name="binutils"/> <repopackage name="boost-license1_54_0"/> <repopackage name="branding-openSUSE"/> <repopackage name="btrfsprogs"/> @@ -86,7 +85,6 @@ <repopackage name="checkmedia"/> <repopackage name="cifs-utils"/> <repopackage name="coreutils"/> - <repopackage name="coreutils-lang"/> <repopackage name="cpio"/> <repopackage name="cpio-lang"/> <repopackage name="cpp"/> @@ -151,7 +149,6 @@ <repopackage name="glib2-tools"/> <repopackage name="glibc"/> <repopackage name="glibc-32bit"/> - <repopackage name="glibc-extra"/> <repopackage name="glibc-locale"/> <repopackage name="glibc-locale-32bit"/> <repopackage name="gnu-unifont-bitmap-fonts"/> @@ -668,7 +665,6 @@ <repopackage name="yast2-pkg-bindings"/> <repopackage name="yast2-printer"/> <repopackage name="yast2-proxy"/> - <repopackage name="yast2-qt-branding-openSUSE"/> <repopackage name="yast2-ruby-bindings"/> <repopackage name="yast2-samba-client"/> <repopackage name="yast2-samba-server"/> @@ -693,8 +689,6 @@ <repopackage name="yast2-ycp-ui-bindings"/> <repopackage name="zypp-plugin-python"/> <repopackage name="zypper"/> - <repopackage name="zypper-aptitude"/> - <repopackage name="zypper-log"/>  </repopackages> </instsource> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qemu for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-03-01 07:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qemu" Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2014-02-25 07:34:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-03-01 07:56:39.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 28 18:21:37 UTC 2014 - afaerber(a)suse.de + +- Move target-x86_64.conf to qemu-x86 sub-package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.BjNxo9/_old 2014-03-01 07:56:40.000000000 +0100 +++ /var/tmp/diff_new_pack.BjNxo9/_new 2014-03-01 07:56:40.000000000 +0100 @@ -609,7 +609,6 @@ %exclude %_datadir/%name/petalogix-s3adsp1800.dtb %exclude %_datadir/%name/qemu-ifup %dir %_sysconfdir/%name -%config %_sysconfdir/%name/target-x86_64.conf %ifarch %ix86 x86_64 %if 0%{?suse_version} >= 1230 %{_udevrulesdir}/80-kvm.rules @@ -625,6 +624,7 @@ %_datadir/%name/kvmvapic.bin %_datadir/%name/linuxboot.bin %_datadir/%name/multiboot.bin +%config %_sysconfdir/%name/target-x86_64.conf %files ppc %defattr(-, root, root) ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.BjNxo9/_old 2014-03-01 07:56:41.000000000 +0100 +++ /var/tmp/diff_new_pack.BjNxo9/_new 2014-03-01 07:56:41.000000000 +0100 @@ -527,7 +527,6 @@ %exclude %_datadir/%name/petalogix-s3adsp1800.dtb %exclude %_datadir/%name/qemu-ifup %dir %_sysconfdir/%name -%config %_sysconfdir/%name/target-x86_64.conf %ifarch %ix86 x86_64 %if 0%{?suse_version} >= 1230 %{_udevrulesdir}/80-kvm.rules @@ -543,6 +542,7 @@ %_datadir/%name/kvmvapic.bin %_datadir/%name/linuxboot.bin %_datadir/%name/multiboot.bin +%config %_sysconfdir/%name/target-x86_64.conf %files ppc %defattr(-, root, root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2014-03-01 07:54:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2014-01-30 11:37:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2014-03-01 07:54:15.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 28 14:42:30 UTC 2014 - adrian(a)suse.de + +- 0.144.1 + - fixed "osc meta pkg -e" regression for special package names + +------------------------------------------------------------------- +Thu Feb 27 09:42:55 UTC 2014 - adrian(a)suse.de + +- 0.144.0 + - allow commiting to package sources from linked projects. osc will ask to branch it first. + - group support in bugowner and maintainer command + +------------------------------------------------------------------- Old: ---- osc-0.143.0.tar.gz New: ---- osc-0.144.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.0Kn5IC/_old 2014-03-01 07:54:15.000000000 +0100 +++ /var/tmp/diff_new_pack.0Kn5IC/_new 2014-03-01 07:54:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: osc -Version: 0.143.0 +Version: 0.144.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.0Kn5IC/_old 2014-03-01 07:54:15.000000000 +0100 +++ /var/tmp/diff_new_pack.0Kn5IC/_new 2014-03-01 07:54:15.000000000 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.143.0 +pkgver=0.144.1 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ groups=('base-devel') depends=('python') source=(osc-${pkgver}.tar.gz) -md5sums=('ad1f262fbb93e6a4c132d615648e6bbe') +md5sums=('d6f0d72f1716d5e57ef02b3ff8a101d8') package() { msg "Installing osc ..." ++++++ _service ++++++ --- /var/tmp/diff_new_pack.0Kn5IC/_old 2014-03-01 07:54:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0Kn5IC/_new 2014-03-01 07:54:16.000000000 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.143.0</param> - <param name="revision">0.143.0</param> + <param name="version">0.144.1</param> + <param name="revision">0.144.1</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ osc-0.143.0.tar.gz -> osc-0.144.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/NEWS new/osc-0.144.1/NEWS --- old/osc-0.143.0/NEWS 2014-01-24 10:50:08.000000000 +0100 +++ new/osc-0.144.1/NEWS 2014-02-28 21:51:20.000000000 +0100 @@ -1,3 +1,7 @@ +0.144 + - allow commiting to package sources from linked projects. osc will ask to branch it first. + - group support in bugowner and maintainer command + 0.143 - add option to add a auto-accept in future for delete requests (handy for admins) - many bugfixes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/osc/build.py new/osc-0.144.1/osc/build.py --- old/osc-0.143.0/osc/build.py 2014-01-24 10:50:08.000000000 +0100 +++ new/osc-0.144.1/osc/build.py 2014-02-28 21:51:20.000000000 +0100 @@ -53,6 +53,7 @@ ] can_also_build = { + 'aarch64':['aarch64'], # only needed due to used heuristics in build parameter evaluation 'armv6l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv5el', 'armv6el' ], 'armv7l' :[ 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el' ], 'armv5el':[ 'armv4l', 'armv5l', 'armv5el' ], # not existing arch, just for compatibility diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/osc/commandline.py new/osc-0.144.1/osc/commandline.py --- old/osc-0.143.0/osc/commandline.py 2014-01-24 10:50:08.000000000 +0100 +++ new/osc-0.144.1/osc/commandline.py 2014-02-28 21:51:20.000000000 +0100 @@ -731,22 +731,30 @@ raise oscerr.WrongArgs('Too many arguments.') apiurl = self.get_api_url() - if len(args) < 2: - apiurl = store_read_apiurl(os.curdir) - # specific arguments + # Specific arguments + # + # If project or package arguments missing, assume to work + # with project and/or package in current local directory. attributepath = [] - if cmd in ['pkg', 'prj', 'prjconf' ]: - if len(args) == 0: + if cmd in ['prj', 'prjconf']: + if len(args) < 1: + apiurl = store_read_apiurl(os.curdir) project = store_read_project(os.curdir) else: project = args[0] - if cmd == 'pkg': - if len(args) < 2: + elif cmd == 'pkg': + if len(args) < 2: + apiurl = store_read_apiurl(os.curdir) + project = store_read_project(os.curdir) + if len(args) < 1: package = store_read_package(os.curdir) else: - package = args[1] + package = args[0] + else: + project = args[0] + package = args[1] elif cmd == 'attribute': project = args[0] @@ -1554,11 +1562,18 @@ if len(args) > 2: package = """package="%s" """ % (args[2]) - if get_user_meta(apiurl, user) == None: - raise oscerr.WrongArgs('osc: an error occured.') + if user.startswith('group:'): + group = user.replace('group:','') + actionxml = """ <action type="set_bugowner"> <target project="%s" %s /> <group name="%s" /> </action> """ % \ + (project, package, group) + if get_group(apiurl, group) == None: + raise oscerr.WrongArgs('osc: an error occured.') + else: + actionxml = """ <action type="set_bugowner"> <target project="%s" %s /> <person name="%s" /> </action> """ % \ + (project, package, user) + if get_user_meta(apiurl, user) == None: + raise oscerr.WrongArgs('osc: an error occured.') - actionxml = """ <action type="set_bugowner"> <target project="%s" %s /> <person name="%s" /> </action> """ % \ - (project, package, user) return actionxml @@ -2252,14 +2267,18 @@ review.by_project, review.by_package, opts.message or '', supersed=supersedid) print(r) except HTTPError as e: - if review.by_user: - print('No permission on review by user %s' % review.by_user) - if review.by_group: - print('No permission on review by group %s' % review.by_group) - if review.by_package: - print('No permission on review by package %s / %s' % (review.by_project, review.by_package)) - elif review.by_project: - print('No permission on review by project %s' % review.by_project) + body = e.read() + if e.code in [403]: + if review.by_user: + print('No permission on review by user %s' % review.by_user) + if review.by_group: + print('No permission on review by group %s' % review.by_group) + if review.by_package: + print('No permission on review by package %s / %s' % (review.by_project, review.by_package)) + elif review.by_project: + print('No permission on review by project %s' % review.by_project) + else: + print(e, file=sys.stderr) else: print('Request is closed, please reopen the request first before changing any reviews.') # Change state of entire request @@ -2285,8 +2304,11 @@ reqid, state_map[cmd], opts.message or '', supersed=supersedid, force=opts.force) print('Result of change request state: %s' % r) except HTTPError as e: + print(e, file=sys.stderr) + details = e.headers.get('X-Opensuse-Errorcode') + if details: + print(details, file=sys.stderr) if opts.or_revoke: - print(e, file=sys.stderr) body = e.read() if e.code in [ 400, 403, 404, 500 ]: print('Revoking it ...') @@ -4259,6 +4281,8 @@ @cmdln.alias('checkin') @cmdln.option('-m', '--message', metavar='TEXT', help='specify log message TEXT') + @cmdln.option('-n', '--no-message', default=False, action='store_true', + help='do not specify a log message') @cmdln.option('-F', '--file', metavar='FILE', help='read log message from FILE, \'-\' denotes standard input.') @cmdln.option('-f', '--force', default=False, action="store_true", @@ -4307,9 +4331,20 @@ if conf.config['do_package_tracking'] and is_project_dir(arg): try: prj = Project(arg) - if not msg: + if not msg and not opts.no_message: msg = edit_message() - prj.commit(msg=msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) + + # check any of the packages is a link, if so, as for branching + pacs = (Package(os.path.join(prj.dir, pac)) + for pac in prj.pacs_have if prj.get_state(pac) == ' ') + can_branch = False + if any(pac.is_link_to_different_project() for pac in pacs): + repl = raw_input('Some of the packages are links to a different project!\n' \ + 'Create a local branch before commit? (y|N) ') + if repl in('y', 'Y'): + can_branch = True + + prj.commit(msg=msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, can_branch=can_branch) except oscerr.ExtRuntimeError as e: print("ERROR: service run failed", e, file=sys.stderr) return 1 @@ -4339,13 +4374,22 @@ pac.todo.sort() for prj_path, packages in prj_paths.items(): prj = Project(prj_path) - if not msg: + if not msg and not opts.no_message: msg = get_commit_msg(prj.absdir, pac_objs[prj_path]) - prj.commit(packages, msg=msg, files=files, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) + + # check any of the packages is a link, if so, as for branching + can_branch = False + if any(pac.is_link_to_different_project() for pac in pacs): + repl = raw_input('Some of the packages are links to a different project!\n' \ + 'Create a local branch before commit? (y|N) ') + if repl in('y', 'Y'): + can_branch = True + + prj.commit(packages, msg=msg, files=files, skip_local_service_run=skip_local_service_run, verbose=opts.verbose, can_branch=can_branch) store_unlink_file(prj.absdir, '_commit_msg') for pac in single_paths: p = Package(pac) - if not msg: + if not msg and not opts.no_message: msg = get_commit_msg(p.absdir, [p]) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) store_unlink_file(p.absdir, '_commit_msg') @@ -4355,7 +4399,7 @@ if not p.todo: p.todo = p.filenamelist + p.filenamelist_unvers p.todo.sort() - if not msg: + if not msg and not opts.no_message: msg = get_commit_msg(p.absdir, [p]) p.commit(msg, skip_local_service_run=skip_local_service_run, verbose=opts.verbose) store_unlink_file(p.absdir, '_commit_msg') @@ -4714,7 +4758,7 @@ opts.show_non_building = None opts.show_excluded = None self.do_prjresults('prjresults', opts, *args) - sys.exit(0) + return if opts.xml and opts.csv: raise oscerr.WrongOptions("--xml and --csv are mutual exclusive") @@ -5436,7 +5480,7 @@ help='Skip initialization of build root and start with build immediately.') @cmdln.option('--nochecks', '--no-checks', action='store_true', help='Do not run post build checks on the resulting packages.') - @cmdln.option('--no-verify', action='store_true', + @cmdln.option('--no-verify', '--noverify', action='store_true', help='Skip signature verification of packages used for build. (Global config in .oscrc: no_verify)') @cmdln.option('--noservice', '--no-service', action='store_true', help='Skip run of local source services as specified in _service file.') @@ -6999,9 +7043,9 @@ @cmdln.option('-A', '--all', action='store_true', help='list all found entries not just the first one') @cmdln.option('-s', '--set-bugowner', metavar='user', - help='Set the bugowner to specified person') + help='Set the bugowner to specified person (or group via group: prefix)') @cmdln.option('-S', '--set-bugowner-request', metavar='user', - help='Set the bugowner to specified person via a request') + help='Set the bugowner to specified person via a request (or group via group: prefix)') @cmdln.option('-U', '--user', metavar='USER', help='All official maintained instances for the specified USER') @cmdln.option('-G', '--group', metavar='GROUP', @@ -7040,6 +7084,16 @@ ${cmd_usage} ${cmd_option_list} """ + def get_maintainer_data(apiurl, maintainer, verbose=False): + tags = ('email',) + if maintainer.startswith('group:'): + group = maintainer.replace('group:', '') + if verbose: + return [maintainer] + get_group_data(apiurl, group, 'title', *tags) + return get_group_data(apiurl, group, 'email') + if verbose: + tags = ('login', 'realname', 'email') + return get_user_data(apiurl, maintainer, *tags) binary = None prj = None @@ -7203,7 +7257,7 @@ print("Following to the development space: %s/%s" % (prj, pac)) m = show_package_meta(apiurl, prj, pac) metaroot = ET.fromstring(''.join(m)) - if not metaroot.findall('person'): + if not metaroot.findall('person') and not metaroot.findall('group'): if opts.verbose: print("No dedicated persons in package defined, showing the project persons.") pac = None @@ -7262,7 +7316,7 @@ if opts.email: emails = [] for maintainer in maintainers.get(role, []): - user = get_user_data(apiurl, maintainer, 'email') + user = get_maintainer_data(apiurl, maintainer, verbose=False) if len(user): emails.append(''.join(user)) print(indent, end=' ') @@ -7270,7 +7324,7 @@ elif opts.verbose: userdata = [] for maintainer in maintainers.get(role, []): - user = get_user_data(apiurl, maintainer, 'login', 'realname', 'email') + user = get_maintainer_data(apiurl, maintainer, verbose=True) userdata.append(user[0]) if user[1] != '-': userdata.append("%s <%s>"%(user[1], user[2])) @@ -7795,7 +7849,9 @@ sys.stdout.write(buf) @cmdln.option('-m', '--message', - help='add MESSAGE to changes (not open an editor)') + help='add MESSAGE to changes (do not open an editor)') + @cmdln.option('-F', '--file', metavar='FILE', + help='read changes message from FILE (do not open an editor)') @cmdln.option('-e', '--just-edit', action='store_true', default=False, help='just open changes (cannot be used with -m)') def do_vc(self, subcmd, opts, *args): @@ -7819,7 +7875,12 @@ """ from subprocess import Popen - + if opts.message and opts.file: + raise oscerr.WrongOptions('\'--message\' and \'--file\' are mutually exclusive') + elif opts.message and opts.just_edit: + raise oscerr.WrongOptions('\'--message\' and \'--just-edit\' are mutually exclusive') + elif opts.file and opts.just_edit: + raise oscerr.WrongOptions('\'--file\' and \'--just-edit\' are mutually exclusive') meego_style = False if not args: import glob, re @@ -7873,6 +7934,11 @@ if opts.message: cmd_list.append("-m") cmd_list.append(opts.message) + if opts.file: + if not os.path.isfile(opts.file): + raise oscerr.WrongOptions('\'%s\': is no file' % opts.file) + cmd_list.append("-m") + cmd_list.append(open(opts.file).read().strip()) if opts.just_edit: cmd_list.append("-e") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/osc/core.py new/osc-0.144.1/osc/core.py --- old/osc-0.143.0/osc/core.py 2014-01-24 10:50:09.000000000 +0100 +++ new/osc-0.144.1/osc/core.py 2014-02-28 21:51:20.000000000 +0100 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.142git' +__version__ = '0.144' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -860,7 +860,7 @@ finally: self.write_packages() - def commit(self, pacs = (), msg = '', files = {}, verbose = False, skip_local_service_run = False): + def commit(self, pacs = (), msg = '', files = {}, verbose = False, skip_local_service_run = False, can_branch=False): if len(pacs): try: for pac in pacs: @@ -879,7 +879,7 @@ else: p = Package(os.path.join(self.dir, pac)) p.todo = todo - p.commit(msg, verbose=verbose, skip_local_service_run=skip_local_service_run) + p.commit(msg, verbose=verbose, skip_local_service_run=skip_local_service_run, can_branch=can_branch) elif pac in self.pacs_unvers and not is_package_dir(os.path.join(self.dir, pac)): print('osc: \'%s\' is not under version control' % pac) elif pac in self.pacs_broken: @@ -1297,7 +1297,7 @@ todo.append(n.get('name')) return todo - def commit(self, msg='', verbose=False, skip_local_service_run=False): + def commit(self, msg='', verbose=False, skip_local_service_run=False, can_branch=False): # commit only if the upstream revision is the same as the working copy's upstream_rev = self.latest_rev() if self.rev != upstream_rev: @@ -1310,6 +1310,21 @@ # information (like which service/command failed) raise oscerr.ServiceRuntimeError('A service failed with error: %d' % r) + # check if it is a link, if so, branch the package + if self.is_link_to_different_project(): + if can_branch: + orgprj = self.get_local_origin_project() + print("Branching {} from {} to {}".format(self.name, orgprj, self.prjname)) + exists, targetprj, targetpkg, srcprj, srcpkg = branch_pkg( + self.apiurl, orgprj, self.name, target_project=self.prjname) + # update _meta and _files to sychronize the local package + # to the new branched one in OBS + self.update_local_pacmeta() + self.update_local_filesmeta() + else: + print("{} Not commited because is link to a different project".format(self.name)) + return 1 + if not self.todo: self.todo = [i for i in self.to_be_added if not i in self.filenamelist] + self.filenamelist @@ -1538,6 +1553,21 @@ e.set('skipped', 'true') return ET.tostring(root, encoding=ET_ENCODING) + def get_local_meta(self): + """Get the local _meta file for the package.""" + meta = store_read_file(self.absdir, '_meta') + return meta + + def get_local_origin_project(self): + """Get the originproject from the _meta file.""" + root = ET.fromstring(self.get_local_meta()) + return root.get('project') + + def is_link_to_different_project(self): + """Check if the package is a link to a different project.""" + orgprj = self.get_local_origin_project() + return self.prjname != orgprj + def update_datastructs(self): """ Update the internal data structures if the local _files @@ -2554,7 +2584,10 @@ elif action.type == 'maintenance_incident': d['source'] = '%s ->' % action.src_project if action.src_package: - d['source'] = '%s ->' % prj_pkg_join(action.src_project, action.src_package) + d['source'] = '%s' % prj_pkg_join(action.src_project, action.src_package) + if action.src_rev: + d['source'] = d['source'] + '@%s' % action.src_rev + d['source'] = d['source'] + ' ->' d['target'] = action.tgt_project if action.tgt_releaseproject: d['target'] += " (release in " + action.tgt_releaseproject + ")" @@ -2562,13 +2595,18 @@ if action.opt_sourceupdate and show_srcupdate: srcupdate = '(%s)' % action.opt_sourceupdate elif action.type == 'maintenance_release': - d['source'] = '%s ->' % prj_pkg_join(action.src_project, action.src_package) + d['source'] = '%s' % prj_pkg_join(action.src_project, action.src_package) + if action.src_rev: + d['source'] = d['source'] + '@%s' % action.src_rev + d['source'] = d['source'] + ' ->' d['target'] = prj_pkg_join(action.tgt_project, action.tgt_package) elif action.type == 'submit': - srcupdate = ' ' + d['source'] = '%s' % prj_pkg_join(action.src_project, action.src_package) + if action.src_rev: + d['source'] = d['source'] + '@%s' % action.src_rev if action.opt_sourceupdate and show_srcupdate: - srcupdate = '(%s)' % action.opt_sourceupdate - d['source'] = '%s%s ->' % (prj_pkg_join(action.src_project, action.src_package), srcupdate) + d['source'] = d['source'] + '(%s)' % action.opt_sourceupdate + d['source'] = d['source'] + ' ->' tgt_package = action.tgt_package if action.src_package == action.tgt_package: tgt_package = '' @@ -3376,6 +3414,17 @@ if edit: change_is_required = True + if metatype == 'pkg': + # check if the package is a link to a different project + project, package = path_args + orgprj = ET.fromstring(''.join(data)).get('project') + if orgprj is not None and unquote(project) != orgprj: + print('The package is linked from a different project.') + print('If you want to edit the meta of the package create first a branch.') + print(' osc branch %s %s %s' % (orgprj, package, unquote(project))) + print(' osc meta pkg %s %s -e' % (unquote(project), package)) + return + url = make_meta_url(metatype, path_args, apiurl, force, remove_linking_repositories) f = metafile(url, data, change_is_required, metatypes[metatype]['file_ext']) @@ -4013,26 +4062,30 @@ return None -def get_user_data(apiurl, user, *tags): - """get specified tags from the user meta""" - meta = get_user_meta(apiurl, user) +def _get_xml_data(meta, *tags): data = [] if meta != None: root = ET.fromstring(meta) for tag in tags: - try: - if root.find(tag).text != None: - data.append(root.find(tag).text) - else: - # tag is empty - data.append('-') - except AttributeError: - # this part is reached if the tags tuple contains an invalid tag - print('The xml file for user \'%s\' seems to be broken' % user) - return [] + elm = root.find(tag) + if elm is None or elm.text is None: + data.append('-') + else: + data.append(elm.text) return data +def get_user_data(apiurl, user, *tags): + """get specified tags from the user meta""" + meta = get_user_meta(apiurl, user) + return _get_xml_data(meta, *tags) + + +def get_group_data(apiurl, group, *tags): + meta = get_group(apiurl, group) + return _get_xml_data(meta, *tags) + + def download(url, filename, progress_obj = None, mtime = None): import tempfile, shutil global BUFSIZE @@ -6086,6 +6139,9 @@ path_args=path, template_args=None, create_new=False) + if user.startswith('group:'): + group=user.replace('group:','') + user=None if data: root = ET.fromstring(''.join(data)) for group_element in root.getiterator('group'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/add/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/add/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/add/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/add/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="add" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/added_missing/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/added_missing/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/added_missing/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/added_missing/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="added_missing" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/allstates/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/allstates/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/allstates/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/allstates/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="allstates" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/branch/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/branch/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/branch/.osc/_meta 2014-01-24 10:50:08.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/branch/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -1,5 +1,5 @@ -<package project="home:Admin" name="unix"> - <title/> - <description>This package was branched from btest in order to ...</description> +<package name="branch" project="osctest"> + <title>Title example</title> + <description>Description example</description> <person role="maintainer" userid="Admin"/> </package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/conflict/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/conflict/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/conflict/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/conflict/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="conflict" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/delete/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/delete/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/delete/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/delete/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="delete" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/multiple/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/multiple/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/multiple/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/multiple/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="multiple" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/nochanges/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/nochanges/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/nochanges/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/nochanges/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="nochanges" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/commit_fixtures/osctest/simple/.osc/_meta new/osc-0.144.1/tests/commit_fixtures/osctest/simple/.osc/_meta --- old/osc-0.143.0/tests/commit_fixtures/osctest/simple/.osc/_meta 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.144.1/tests/commit_fixtures/osctest/simple/.osc/_meta 2014-02-28 21:51:20.000000000 +0100 @@ -0,0 +1,4 @@ +<package name="simple" project="osctest"> + <title>Title example</title> + <description>Description example</description> +</package> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/test_prdiff.py new/osc-0.144.1/tests/test_prdiff.py --- old/osc-0.143.0/tests/test_prdiff.py 2014-01-24 10:50:08.000000000 +0100 +++ new/osc-0.144.1/tests/test_prdiff.py 2014-02-28 21:51:20.000000000 +0100 @@ -237,7 +237,7 @@ differs: common-two 148023 State:new By:user When:2013-01-11T11:04:14 - submit: home:user:branches:some:project/common-two -> some:project + submit: home:user:branches:some:project/common-two@7 -> some:project Descr: - Fix it to work - Improve support for something differs: common-three diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.143.0/tests/test_request.py new/osc-0.144.1/tests/test_request.py --- old/osc-0.143.0/tests/test_request.py 2014-01-24 10:50:08.000000000 +0100 +++ new/osc-0.144.1/tests/test_request.py 2014-02-28 21:51:20.000000000 +0100 @@ -438,8 +438,8 @@ add_role: person: xyz as maintainer, group: group1 as reader foobar add_role: person: abc as reviewer foo/bar change_devel: foo/bar developed in devprj/devpkg - submit: srcprj/srcpackage -> tgtprj/tgtpackage - submit: foo/bar -> baz + submit: srcprj/srcpackage -> tgtprj/tgtpackage + submit: foo/bar -> baz delete: deleteme delete: foo/bar\n""" r = osc.core.Request() ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.0Kn5IC/_old 2014-03-01 07:54:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0Kn5IC/_new 2014-03-01 07:54:16.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.143.0 +Version: 0.144.1 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdump for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-03-01 07:51:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-02-15 08:05:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-03-01 07:51:22.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Feb 28 19:18:00 UTC 2014 - ptesarik(a)suse.cz + +- Update to 0.8.9 + o fix dracut support + o fix dump save when /boot is not a mount point + +- kdumptool_find_kernel.patch: Dropped. + +------------------------------------------------------------------- +Fri Feb 28 17:21:29 UTC 2014 - ptesarik(a)suse.cz + +- Update to 0.8.8 + o dracut support + o new kdumptool command: calibrate + o new kdumptool flag: NOSPLIT + o better support for SMP dumps + +- kdump-0.8.7-bsp.patch: Dropped. +- kdump-0.8.7-calibrate.patch: Dropped. +- kdump-0.8.7-nr_cpus.patch: Dropped. + +------------------------------------------------------------------- Old: ---- kdump-0.8.7-bsp.patch kdump-0.8.7-calibrate.patch kdump-0.8.7-nr_cpus.patch kdump-0.8.7-rpmlintrc kdump-0.8.7.tar.bz2 kdumptool_find_kernel.patch New: ---- kdump-0.8.9-rpmlintrc kdump-0.8.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.K3wisS/_old 2014-03-01 07:51:22.000000000 +0100 +++ /var/tmp/diff_new_pack.K3wisS/_new 2014-03-01 07:51:22.000000000 +0100 @@ -16,10 +16,12 @@ # +%define dracutlibdir %{_prefix}/lib/dracut + Url: http://freehg.org/u/bwalle/kdump/ Name: kdump -Version: 0.8.7 +Version: 0.8.9 Release: 0 Requires: curl Requires: makedumpfile @@ -47,10 +49,6 @@ Source: %{name}-%{version}.tar.bz2 Source2: %{name}-%{version}-rpmlintrc Source3: kdump.service -Patch1: kdumptool_find_kernel.patch -Patch2: %{name}-%{version}-nr_cpus.patch -Patch3: %{name}-%{version}-bsp.patch -Patch4: %{name}-%{version}-calibrate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -88,10 +86,6 @@ %prep %setup -%patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build export CFLAGS="%optflags" @@ -181,6 +175,10 @@ /lib/mkinitrd/scripts/*-kdump.sh /lib/mkinitrd/scripts/setup-kdumpfs.sh /lib/mkinitrd/scripts/setup-mkdumprd.sh +%dir %{dracutlibdir} +%dir %{dracutlibdir}/modules.d +%dir %{dracutlibdir}/modules.d/99kdump +%{dracutlibdir}/modules.d/99kdump/* %dir /lib/kdump /lib/kdump/* %config %{_sysconfdir}/udev/rules.d/70-kdump.rules ++++++ kdump-0.8.7-rpmlintrc -> kdump-0.8.9-rpmlintrc ++++++ ++++++ kdump-0.8.7.tar.bz2 -> kdump-0.8.9.tar.bz2 ++++++ ++++ 1964 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qupzilla-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '14

01 Mar '14

Hello community, here is the log from the commit of package qupzilla-qt5 for openSUSE:Factory checked in at 2014-03-01 07:47:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qupzilla-qt5 (Old) and /work/SRC/openSUSE:Factory/.qupzilla-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qupzilla-qt5" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package="qupzilla" cicount="copy" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0