commit qemu for openSUSE:Factory
Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2014-07-11 20:05:25 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.changes2014-06-18 10:59:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2014-07-11 20:05:27.0 +0200 @@ -1,0 +2,10 @@ +Wed Jun 23 21:42:31 UTC 2014 - afaer...@suse.de + +- Move block-curl.so to new qemu-block-curl package, avoiding a + dependency of qemu-tools on qemu for Xen (bnc#882008) +* Avoid the reported error message about missing modules + 0071-module-Simplify-module_load.patch + 0072-module-Don-t-complain-when-a-module.patch +- Improve update_git.sh performance (backport from SLE12) + +--- New: 0071-module-Simplify-module_load.patch 0072-module-Don-t-complain-when-a-module.patch Other differences: -- ++ qemu-linux-user.spec ++ --- /var/tmp/diff_new_pack.0A0CbW/_old 2014-07-11 20:05:29.0 +0200 +++ /var/tmp/diff_new_pack.0A0CbW/_new 2014-07-11 20:05:29.0 +0200 @@ -95,6 +95,8 @@ Patch0068: 0068-virtio-net-out-of-bounds-buffer-wri.patch Patch0069: 0069-virtio-validate-config_len-on-load.patch Patch0070: 0070-virtio-allow-mapping-up-to-max-queu.patch +Patch0071: 0071-module-Simplify-module_load.patch +Patch0072: 0072-module-Don-t-complain-when-a-module.patch # Please do not add patches manually here, run update_git.sh. # this is to make lint happy Source300: rpmlintrc @@ -218,6 +220,8 @@ %patch0068 -p1 %patch0069 -p1 %patch0070 -p1 +%patch0071 -p1 +%patch0072 -p1 %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ ++ qemu.spec ++ --- /var/tmp/diff_new_pack.0A0CbW/_old 2014-07-11 20:05:29.0 +0200 +++ /var/tmp/diff_new_pack.0A0CbW/_new 2014-07-11 20:05:29.0 +0200 @@ -124,6 +124,8 @@ Patch0068: 0068-virtio-net-out-of-bounds-buffer-wri.patch Patch0069: 0069-virtio-validate-config_len-on-load.patch Patch0070: 0070-virtio-allow-mapping-up-to-max-queu.patch +Patch0071: 0071-module-Simplify-module_load.patch +Patch0072: 0072-module-Don-t-complain-when-a-module.patch # Please do not add patches manually here, run update_git.sh. # roms/ipxe patches @@ -221,6 +223,7 @@ Requires: /usr/sbin/groupadd Requires: pwdutils Requires: timezone +Recommends: qemu-block-curl Recommends: qemu-tools Recommends: qemu-x86 %ifarch ppc ppc64 ppc64le @@ -368,6 +371,26 @@ This sub-package contains translations. +%package block-curl +Summary:Universal CPU emulator -- cURL block support +Group: System/Emulators/PC +Provides: qemu:%_libdir/%name/block-curl.so +# Needs to match {qemu-system-*,qemu-img} = 2.0.0, but is optional. +Conflicts: qemu %version +Conflicts: qemu %version +Conflicts: qemu-tools %version +Conflicts: qemu-tools %version + +%description block-curl +QEMU is an extremely well-performing CPU emulator that allows you to +choose between simulating an entire system and running userspace +binaries for different architectures under your native operating +system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well +as PC and PowerMac systems. + +This sub-package contains a module for accessing network-based image files +over a network connection from qemu-img tool and QEMU system emulation. + %package tools Summary:Universal CPU emulator -- Tools Group: System/Emulators/PC @@ -375,6 +398,7 @@ Obsoletes: libcacard = 0.1.2 Provides: libcacard PreReq: permissions +Recommends: qemu-block-curl %description tools QEMU is an extremely well-performing CPU emulator that allows you to @@ -573,6 +597,8 @@ %patch0068 -p1 %patch0069 -p1 %patch0070 -p1 +%patch0071 -p1 +%patch0072 -p1 %patch1000 -p1 %patch1001 -p1 @@ -740,7 +766,6 @@ %files %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/block-curl.so %doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html %doc %_mandir/man1/qemu.1.gz %_datadir/%name @@ -864,6 +889,11 @@ %_mandir/man1/qemu-kvm.1.gz %endif +%files block-curl +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/block-curl.so + %files lang -f %name.lang %defattr(-, root, root) ++ 0071-module-Simplify-module_load.patch ++ From 212b80fa19390023a809068c5d282e2994bd98bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= afaer...@suse.de Date: Fri, 20 Jun 2014 16:46:50 +0200 Subject: [PATCH] module: Simplify
commit yast2-installation for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-07-11 20:05:27 Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) Package is yast2-installation Changes: --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-07-02 15:04:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-07-11 20:05:30.0 +0200 @@ -1,0 +2,13 @@ +Fri Jul 4 08:48:03 UTC 2014 - jreidin...@suse.com + +- Copy multipath blacklist to target system (bnc#885628) +- 3.1.99 + +--- +Thu Jul 3 09:14:53 UTC 2014 - jreidin...@suse.com + +- remove useless steps from system analysis because it confuses + users (bnc#885609) +- 3.1.98 + +--- Old: yast2-installation-3.1.97.tar.bz2 New: yast2-installation-3.1.99.tar.bz2 Other differences: -- ++ yast2-installation.spec ++ --- /var/tmp/diff_new_pack.PFMcxS/_old 2014-07-11 20:05:31.0 +0200 +++ /var/tmp/diff_new_pack.PFMcxS/_new 2014-07-11 20:05:31.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version:3.1.97 +Version:3.1.99 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++ yast2-installation-3.1.97.tar.bz2 - yast2-installation-3.1.99.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/package/yast2-installation.changes new/yast2-installation-3.1.99/package/yast2-installation.changes --- old/yast2-installation-3.1.97/package/yast2-installation.changes 2014-07-01 08:07:19.0 +0200 +++ new/yast2-installation-3.1.99/package/yast2-installation.changes 2014-07-04 11:05:31.0 +0200 @@ -1,4 +1,17 @@ --- +Fri Jul 4 08:48:03 UTC 2014 - jreidin...@suse.com + +- Copy multipath blacklist to target system (bnc#885628) +- 3.1.99 + +--- +Thu Jul 3 09:14:53 UTC 2014 - jreidin...@suse.com + +- remove useless steps from system analysis because it confuses + users (bnc#885609) +- 3.1.98 + +--- Mon Jun 30 14:34:59 UTC 2014 - jreidin...@suse.cz - restore: use restore script instead of manual unpacking tarball diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/package/yast2-installation.spec new/yast2-installation-3.1.99/package/yast2-installation.spec --- old/yast2-installation-3.1.97/package/yast2-installation.spec 2014-07-01 08:07:19.0 +0200 +++ new/yast2-installation-3.1.99/package/yast2-installation.spec 2014-07-04 11:05:31.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version:3.1.97 +Version:3.1.99 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.97/src/clients/copy_files_finish.rb new/yast2-installation-3.1.99/src/clients/copy_files_finish.rb --- old/yast2-installation-3.1.97/src/clients/copy_files_finish.rb 2014-07-01 08:07:19.0 +0200 +++ new/yast2-installation-3.1.99/src/clients/copy_files_finish.rb 2014-07-04 11:05:31.0 +0200 @@ -28,6 +28,8 @@ # Authors: # Jiri Srain jsr...@suse.cz # +require fileutils + module Yast class CopyFilesFinishClient Client include Yast::Logger @@ -42,6 +44,7 @@ Yast.import Linuxrc Yast.import Installation Yast.import Directory + Yast.import Mode Yast.import Packages Yast.import ProductControl Yast.import ProductProfile @@ -109,6 +112,17 @@ ) end +# Copy multipath stuff (bnc#885628) +# Only in install, as update should keep its old config +if Mode.installation + multipath_config = /etc/multipath/wwids + if File.exist?(multipath_config) +log.info Copying multipath blacklist '#{multipath_config}' +target_path = File.join(Installation.destdir, multipath_config) +::FileUtils.mkdir_p(File.dirname(target_path)) +::FileUtils.cp(multipath_config, target_path) + end +end # -- # Copy /etc/install.inf into
commit yast2-vm for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2014-07-11 20:05:24 Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) Package is yast2-vm Changes: --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes2014-06-26 08:00:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2014-07-11 20:05:25.0 +0200 @@ -1,0 +2,6 @@ +Wed Jul 2 17:02:00 MDT 2014 - carn...@suse.com + +- Don't create a bridge on SLED as it is not a Virtualization Host. +- 3.1.14 + +--- Old: yast2-vm-3.1.13.tar.bz2 New: yast2-vm-3.1.14.tar.bz2 Other differences: -- ++ yast2-vm.spec ++ --- /var/tmp/diff_new_pack.WZBdNN/_old 2014-07-11 20:05:26.0 +0200 +++ /var/tmp/diff_new_pack.WZBdNN/_new 2014-07-11 20:05:26.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version:3.1.13 +Version:3.1.14 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++ yast2-vm-3.1.13.tar.bz2 - yast2-vm-3.1.14.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.13/package/yast2-vm.changes new/yast2-vm-3.1.14/package/yast2-vm.changes --- old/yast2-vm-3.1.13/package/yast2-vm.changes2014-06-18 16:47:50.0 +0200 +++ new/yast2-vm-3.1.14/package/yast2-vm.changes2014-07-03 01:32:23.0 +0200 @@ -1,4 +1,10 @@ --- +Wed Jul 2 17:02:00 MDT 2014 - carn...@suse.com + +- Don't create a bridge on SLED as it is not a Virtualization Host. +- 3.1.14 + +--- Wed Jun 18 08:29:15 MDT 2014 - carn...@suse.com - Include enable and start of libvirtd service for s390x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.13/package/yast2-vm.spec new/yast2-vm-3.1.14/package/yast2-vm.spec --- old/yast2-vm-3.1.13/package/yast2-vm.spec 2014-06-18 16:47:50.0 +0200 +++ new/yast2-vm-3.1.14/package/yast2-vm.spec 2014-07-03 01:32:23.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version:3.1.13 +Version:3.1.14 Release:0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.13/src/modules/VM_XEN.rb new/yast2-vm-3.1.14/src/modules/VM_XEN.rb --- old/yast2-vm-3.1.13/src/modules/VM_XEN.rb 2014-06-18 16:47:50.0 +0200 +++ new/yast2-vm-3.1.14/src/modules/VM_XEN.rb 2014-07-03 01:32:23.0 +0200 @@ -277,6 +277,9 @@ ), ) elsif isSLED == true +progress_stages = [ + _(Verify Installed Packages) +] UI.OpenDialog( HBox( HSpacing(2), @@ -463,44 +466,47 @@ end if is_s390 == false -# Default Bridge stage -Progress.NextStage +# SLED is not a Virtualization Host so don't create a bridge +if isSLED == false + # Default Bridge stage + Progress.NextStage -Progress.Title(_(Configuring Default Network Bridge...)) + Progress.Title(_(Configuring Default Network Bridge...)) -# Check for the existance of /sys/class/net/*/bridge -interfaces = Convert.convert( - SCR.Read(path(.target.dir), @net_path), - :from = any, - :to = list string -) -Builtins.foreach(interfaces) do |i| - Builtins.y2milestone(Checking for bridges...) - bridge_path = Ops.add(Ops.add(Ops.add(@net_path, /), i), /bridge) - if Ops.greater_or_equal(SCR.Read(path(.target.dir), bridge_path), 0) -Builtins.y2milestone(Dom0 already has a configured bridge.) -bridge_exists = true -raise Break + # Check for the existance of /sys/class/net/*/bridge + interfaces = Convert.convert( +SCR.Read(path(.target.dir), @net_path), +:from = any, +:to = list string + ) + Builtins.foreach(interfaces) do |i| +Builtins.y2milestone(Checking for bridges...) +bridge_path = Ops.add(Ops.add(Ops.add(@net_path, /), i), /bridge) +if Ops.greater_or_equal(SCR.Read(path(.target.dir), bridge_path), 0) + Builtins.y2milestone(Dom0 already has a configured bridge.) + bridge_exists = true + raise Break +end end
commit jgroups for openSUSE:Factory
Hello community, here is the log from the commit of package jgroups for openSUSE:Factory checked in at 2014-07-11 20:05:49 Comparing /work/SRC/openSUSE:Factory/jgroups (Old) and /work/SRC/openSUSE:Factory/.jgroups.new (New) Package is jgroups Changes: --- /work/SRC/openSUSE:Factory/jgroups/jgroups.changes 2014-06-30 22:49:59.0 +0200 +++ /work/SRC/openSUSE:Factory/.jgroups.new/jgroups.changes 2014-07-11 20:05:50.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:46:17 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-trax and run spec-cleaner. + +--- Other differences: -- ++ jgroups.spec ++ --- /var/tmp/diff_new_pack.drksFG/_old 2014-07-11 20:05:51.0 +0200 +++ /var/tmp/diff_new_pack.drksFG/_new 2014-07-11 20:05:51.0 +0200 @@ -26,8 +26,6 @@ # give rpmbuild option '--without tests' %define with_tests %{!?_without_tests:1}%{?_without_tests:0} %define without_tests %{?_without_tests:1}%{!?_without_tests:0} -%define section free - Name: jgroups Version:2.6.10 Release:0 @@ -51,34 +49,28 @@ Source1:jgroups-component-info.xml #PATCH-FIX-OPENSUSE: junit.swingui does not exists in junit 4 Patch0: jgroups-swingui.patch -# To use JGroups one needs: -Requires: apache-commons-logging -# 2.5+ uses java.util.concurrent -#Requires: concurrent -Requires: bsh -Requires: geronimo-jms-1_1-api -Requires: jaxp_parser_impl -Requires: log4j -#Optional: mx4j -Provides: javagroups = %{version} -Obsoletes: javagroups %{version} BuildRequires: ant = 1.6 BuildRequires: ant-junit -BuildRequires: ant-trax +BuildRequires: apache-commons-logging BuildRequires: bsh +BuildRequires: geronimo-jms-1_1-api BuildRequires: java-devel = 1.5.0 BuildRequires: javapackages-tools -# 2.5+ uses java.util.concurrent -#BuildRequires: concurrent -BuildRequires: apache-commons-logging -BuildRequires: geronimo-jms-1_1-api BuildRequires: jaxp_parser_impl BuildRequires: junit BuildRequires: log4j BuildRequires: mx4j BuildRequires: xalan-j2 -BuildArch: noarch +# To use JGroups one needs: +Requires: apache-commons-logging +Requires: bsh +Requires: geronimo-jms-1_1-api +Requires: jaxp_parser_impl +Requires: log4j +Provides: javagroups = %{version} +Obsoletes: javagroups %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description JGroups is a toolkit for reliable multicast communication. (Note that @@ -120,7 +112,6 @@ %endif %package javadoc -PreReq: coreutils Summary:Javadoc for jgroups Group: Development/Libraries/Java @@ -197,35 +188,32 @@ %install # jar -install -d $RPM_BUILD_ROOT%{_javadir} +install -d %{buildroot}%{_javadir} install -m 644 dist/%{name}-all.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar install -m 644 dist/%{name}-core.jar \ -$RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed s|-%{version}||g`; done) +%{buildroot}%{_javadir}/%{name}-core-%{version}.jar +(cd %{buildroot}%{_javadir} for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed s|-%{version}||g`; done) # javadoc -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ -(cd $RPM_BUILD_ROOT%{_javadocdir} ln -sf %{name}-%{version} %{name}) +install -d %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ +(cd %{buildroot}%{_javadocdir} ln -sf %{name}-%{version} %{name}) # services -install -p -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +install -p -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version} install -m 644 dist/%{name}*.sar \ -$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +%{buildroot}%{_datadir}/%{name}-%{version} # docs -install -p -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +install -p -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version} +cp -pr doc/* %{buildroot}%{_docdir}/%{name}-%{version} %if %{with_repolib} - install -d -m 755 $RPM_BUILD_ROOT%{repodir} - install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} - install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml - install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} - install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc} - cp -p
commit joda-time for openSUSE:Factory
Hello community, here is the log from the commit of package joda-time for openSUSE:Factory checked in at 2014-07-11 20:05:50 Comparing /work/SRC/openSUSE:Factory/joda-time (Old) and /work/SRC/openSUSE:Factory/.joda-time.new (New) Package is joda-time Changes: --- /work/SRC/openSUSE:Factory/joda-time/joda-time.changes 2013-09-12 17:04:42.0 +0200 +++ /work/SRC/openSUSE:Factory/.joda-time.new/joda-time.changes 2014-07-11 20:05:51.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:55:07 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-nodeps. + +--- Other differences: -- ++ joda-time.spec ++ --- /var/tmp/diff_new_pack.Ggp0TD/_old 2014-07-11 20:05:52.0 +0200 +++ /var/tmp/diff_new_pack.Ggp0TD/_new 2014-07-11 20:05:52.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package joda-time # -# 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,28 +17,24 @@ %define tzversion tzdata2010h - Name: joda-time Version:1.6 Release:0 Summary:Java date and time API License:Apache-2.0 Group: Development/Libraries - Url:http://joda-time.sourceforge.net/index.html Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz Source1:ftp://elsie.nci.nih.gov/pub/%{tzversion}.tar.gz Patch0: joda-time-use-system-junit.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - BuildRequires: ant -BuildRequires: ant-nodeps BuildRequires: java-devel 1.5.0 BuildRequires: javapackages-tools BuildRequires: junit Requires: java 1.5.0 Requires: javapackages-tools +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Joda-Time provides a quality replacement for the Java date @@ -50,7 +46,6 @@ Supporting classes include time zone, duration, format and parsing. - %packagejavadoc Summary:Javadocs for %{name} Group: Documentation @@ -60,7 +55,6 @@ %descriptionjavadoc This package contains the API documentation for %{name}. - %prep %setup -q -n %{name}-%{version}-src %patch0 -p1 @@ -91,9 +85,6 @@ install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -a build/docs/* %{buildroot}%{_javadocdir}/%{name} -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit salt for openSUSE:Factory
Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-07-11 20:05:44 Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) Package is salt Changes: --- /work/SRC/openSUSE:Factory/salt/salt.changes2014-07-10 09:31:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-07-11 20:05:45.0 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 18:25:05 UTC 2014 - abo...@gmail.com + +- Update to 2014.7 + This release was a hotfix release for the regression listed above which was present in the 2014.1.6 +- Fix batch mode regression (issue 14046) + +--- Old: salt-2014.1.6.tar.gz New: salt-2014.1.7.tar.gz Other differences: -- ++ salt.spec ++ --- /var/tmp/diff_new_pack.VozOEf/_old 2014-07-11 20:05:46.0 +0200 +++ /var/tmp/diff_new_pack.VozOEf/_new 2014-07-11 20:05:46.0 +0200 @@ -17,7 +17,7 @@ Name: salt -Version:2014.1.6 +Version:2014.1.7 Release:0 Summary:A parallel remote execution system License:Apache-2.0 ++ salt-2014.1.6.tar.gz - salt-2014.1.7.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/PKG-INFO new/salt-2014.1.7/PKG-INFO --- old/salt-2014.1.6/PKG-INFO 2014-07-08 23:01:34.0 +0200 +++ new/salt-2014.1.7/PKG-INFO 2014-07-09 23:02:13.0 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: salt -Version: 2014.1.6 +Version: 2014.1.7 Summary: Portable, distributed, remote execution and configuration management system Home-page: http://saltstack.org Author: Thomas S Hatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/doc/conf.py new/salt-2014.1.7/doc/conf.py --- old/salt-2014.1.6/doc/conf.py 2014-06-27 22:26:23.0 +0200 +++ new/salt-2014.1.7/doc/conf.py 2014-07-09 22:57:10.0 +0200 @@ -117,7 +117,7 @@ version = salt.version.__version__ #release = '.'.join(map(str, salt.version.__version_info__)) -release = '2014.1.6' +release = '2014.1.7' language = 'en' locale_dirs = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/doc/topics/releases/2014.1.7.rst new/salt-2014.1.7/doc/topics/releases/2014.1.7.rst --- old/salt-2014.1.6/doc/topics/releases/2014.1.7.rst 1970-01-01 01:00:00.0 +0100 +++ new/salt-2014.1.7/doc/topics/releases/2014.1.7.rst 2014-07-09 22:56:59.0 +0200 @@ -0,0 +1,31 @@ +=== +Salt 2014.1.7 Release Notes +=== + +:release: 2014-07-09 + +Version 2014.1.7 is another bugfix release for :doc:`2014.1.0 +/topics/releases/2014.1.0`. Changes include: + +- Fix batch mode regression (:issue:`14046`) + +This release was a hotfix release for the regression listed above which was +present in the 2014.1.6 release. The changes included in 2014.1.6 are listed +below: + +- Fix extra ``iptables --help`` output (Sorry!) (:issue:`13648`, + :issue:`13507`, :issue:`13527`, :issue:`13607`) +- Fix ``mount.active`` for Solaris +- Fix support for ``allow-hotplug`` statement in debian_ip network module +- Add sqlite3 to esky builds +- Fix ``jobs.active`` output (:issue:`9526`) +- Fix the ``virtual`` grain for Xen (:issue:`13534`) +- Fix eauth for batch mode (:issue:`9605`) +- Fix force-related issues with ``tomcat`` support (:issue:`12889`) +- Fix KeyError when cloud mapping +- Fix salt-minion restart loop in Windows (:issue:`12086`) +- Fix detection of ``service`` virtual module on Fedora minions +- Fix traceback with missing ipv4 grain (:issue:`13838`) +- Fix issue in roots backend with invalid data in mtime_map (:issue:`13836`) +- Fix traceback in ``jobs.active`` (:issue:`11151`) +- Fix ``master_tops`` and ``_ext_nodes`` issue (:issue:`13535`, :issue:`13673`) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/salt/cli/__init__.py new/salt-2014.1.7/salt/cli/__init__.py --- old/salt-2014.1.6/salt/cli/__init__.py 2014-06-27 22:26:23.0 +0200 +++ new/salt-2014.1.7/salt/cli/__init__.py 2014-07-09 20:14:25.0 +0200 @@ -59,27 +59,7 @@ return if self.options.batch: -eauth = {} -if 'token' in self.config: -eauth['token'] = self.config['token'] - -# If using eauth and a token hasn't already been loaded into -# kwargs, prompt the user to enter auth credentials -if 'token' not in eauth and self.options.eauth: -
commit yast2-storage for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-07-11 20:05:30 Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) Package is yast2-storage Changes: --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-07-02 15:04:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-07-11 20:05:34.0 +0200 @@ -1,0 +2,25 @@ +Thu Jul 10 12:25:03 CEST 2014 - aschn...@suse.de + +- fixed creating extended partitions in expert partitioner + (bnc#886575) +- version 3.1.37 + +--- +Fri Jul 04 14:30:52 CEST 2014 - aschn...@suse.de + +- added extra dialog to select role of device (fate#317140) +- version 3.1.36 + +--- +Fri Jul 04 10:27:43 CEST 2014 - aschn...@suse.de + +- fixed subvolume for postgresql (bnc#885813) +- version 3.1.35 + +--- +Mon Jul 03 15:20:42 CEST 2014 - dval...@suse.com + +- Fix GRUB2 architecture name for PowerPC +- version 3.1.34 + +--- @@ -11 +36 @@ -- disable timeline of snapshots for root fs +- disable timeline of snapshots for root fs (bnc#885510) Old: yast2-storage-3.1.33.tar.bz2 New: yast2-storage-3.1.37.tar.bz2 Other differences: -- ++ yast2-storage.spec ++ --- /var/tmp/diff_new_pack.WpOovH/_old 2014-07-11 20:05:35.0 +0200 +++ /var/tmp/diff_new_pack.WpOovH/_new 2014-07-11 20:05:35.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version:3.1.33 +Version:3.1.37 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -140,8 +140,8 @@ Group: Development/Libraries/YaST %description devel -This package contains the files for YaST2 that are needed of one wants -to develop a program using libstorage. +This package contains the files for YaST2 that are needed if one wants +to develop a program using yast2-storage. %files devel %defattr(-,root,root) ++ yast2-storage-3.1.33.tar.bz2 - yast2-storage-3.1.37.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.33/package/yast2-storage.changes new/yast2-storage-3.1.37/package/yast2-storage.changes --- old/yast2-storage-3.1.33/package/yast2-storage.changes 2014-07-01 08:09:49.0 +0200 +++ new/yast2-storage-3.1.37/package/yast2-storage.changes 2014-07-10 12:59:28.0 +0200 @@ -1,4 +1,29 @@ --- +Thu Jul 10 12:25:03 CEST 2014 - aschn...@suse.de + +- fixed creating extended partitions in expert partitioner + (bnc#886575) +- version 3.1.37 + +--- +Fri Jul 04 14:30:52 CEST 2014 - aschn...@suse.de + +- added extra dialog to select role of device (fate#317140) +- version 3.1.36 + +--- +Fri Jul 04 10:27:43 CEST 2014 - aschn...@suse.de + +- fixed subvolume for postgresql (bnc#885813) +- version 3.1.35 + +--- +Mon Jul 03 15:20:42 CEST 2014 - dval...@suse.com + +- Fix GRUB2 architecture name for PowerPC +- version 3.1.34 + +--- Mon Jun 30 14:37:06 CEST 2014 - aschn...@suse.de - enable btrfs quota if snapshots are enabled (prototype for @@ -8,7 +33,7 @@ --- Thu Jun 26 16:36:42 CEST 2014 - aschn...@suse.de -- disable timeline of snapshots for root fs +- disable timeline of snapshots for root fs (bnc#885510) - version 3.1.32 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.33/package/yast2-storage.spec new/yast2-storage-3.1.37/package/yast2-storage.spec --- old/yast2-storage-3.1.33/package/yast2-storage.spec 2014-07-01 08:09:49.0 +0200 +++ new/yast2-storage-3.1.37/package/yast2-storage.spec 2014-07-10 12:59:28.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version:3.1.33 +Version:3.1.37 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -137,8 +137,8 @@ Group: Development/Libraries/YaST %description devel -This package contains the files for YaST2 that are needed of
commit yast2-bootloader for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-07-11 20:05:31 Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) Package is yast2-bootloader Changes: --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-07-02 15:04:07.0 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-07-11 20:05:36.0 +0200 @@ -1,0 +2,38 @@ +Fri Jul 11 08:17:54 UTC 2014 - jreidin...@suse.com + +- fix writing sysconfig for grub1 (bnc#885634) +- 3.1.66 + +--- +Fri Jul 11 07:11:41 UTC 2014 - mch...@suse.com + +- fix secure boot widget did not function from installed system + because bootloader not get re-installed (bnc#882124) +- 3.1.65 + +--- +Wed Jul 9 09:49:21 UTC 2014 - jreidin...@suse.com + +- add check for combination of MBR, GPT, btrfs and missing + bios_grub partitition (bnc#886143) +- 3.1.64 + +--- +Tue Jul 8 11:08:06 UTC 2014 - jreidin...@suse.com + +- warn user if no location chosen for stage 1 (bnc#885208) +- 3.1.63 + +--- +Mon Jul 7 13:33:19 UTC 2014 - jreidin...@suse.com + +- use only simple device map on s390 (bnc#884798, bnc#885984) +- 3.1.62 + +--- +Thu Jul 3 07:33:51 UTC 2014 - jreidin...@suse.com + +- add perl-Bootloader-YAML to needed packages (BNC#885496) +- 3.1.61 + +--- Old: yast2-bootloader-3.1.60.tar.bz2 New: yast2-bootloader-3.1.66.tar.bz2 Other differences: -- ++ yast2-bootloader.spec ++ --- /var/tmp/diff_new_pack.6nGahM/_old 2014-07-11 20:05:37.0 +0200 +++ /var/tmp/diff_new_pack.6nGahM/_new 2014-07-11 20:05:37.0 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version:3.1.60 +Version:3.1.66 Release:0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++ yast2-bootloader-3.1.60.tar.bz2 - yast2-bootloader-3.1.66.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.60/package/yast2-bootloader.changes new/yast2-bootloader-3.1.66/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.60/package/yast2-bootloader.changes 2014-07-01 08:11:44.0 +0200 +++ new/yast2-bootloader-3.1.66/package/yast2-bootloader.changes 2014-07-11 10:08:30.0 +0200 @@ -1,8 +1,46 @@ --- +Fri Jul 11 08:17:54 UTC 2014 - jreidin...@suse.com + +- fix writing sysconfig for grub1 (bnc#885634) +- 3.1.66 + +--- +Fri Jul 11 07:11:41 UTC 2014 - mch...@suse.com + +- fix secure boot widget did not function from installed system + because bootloader not get re-installed (bnc#882124) +- 3.1.65 + +--- +Wed Jul 9 09:49:21 UTC 2014 - jreidin...@suse.com + +- add check for combination of MBR, GPT, btrfs and missing + bios_grub partitition (bnc#886143) +- 3.1.64 + +--- +Tue Jul 8 11:08:06 UTC 2014 - jreidin...@suse.com + +- warn user if no location chosen for stage 1 (bnc#885208) +- 3.1.63 + +--- +Mon Jul 7 13:33:19 UTC 2014 - jreidin...@suse.com + +- use only simple device map on s390 (bnc#884798, bnc#885984) +- 3.1.62 + +--- +Thu Jul 3 07:33:51 UTC 2014 - jreidin...@suse.com + +- add perl-Bootloader-YAML to needed packages (BNC#885496) +- 3.1.61 + +--- Fri Jun 27 13:31:01 UTC 2014 - jreidin...@suse.com - do not allow to install to partition with xfs otherwise fs can be - broken due to missing reserved space in xfs(bnc#884255) + broken due to missing reserved space in xfs(bnc#884255) - 3.1.60 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.60/package/yast2-bootloader.spec new/yast2-bootloader-3.1.66/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.60/package/yast2-bootloader.spec 2014-07-01
commit laf-plugin for openSUSE:Factory
Hello community, here is the log from the commit of package laf-plugin for openSUSE:Factory checked in at 2014-07-11 20:05:54 Comparing /work/SRC/openSUSE:Factory/laf-plugin (Old) and /work/SRC/openSUSE:Factory/.laf-plugin.new (New) Package is laf-plugin Changes: --- /work/SRC/openSUSE:Factory/laf-plugin/laf-plugin.changes2014-05-06 17:40:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.laf-plugin.new/laf-plugin.changes 2014-07-11 20:05:55.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:12:53 UTC 2014 - tchva...@suse.com + +- Cleanup with spec-cleaner and make it build properly with sle11 + +--- Other differences: -- ++ laf-plugin.spec ++ --- /var/tmp/diff_new_pack.uznt66/_old 2014-07-11 20:05:56.0 +0200 +++ /var/tmp/diff_new_pack.uznt66/_new 2014-07-11 20:05:56.0 +0200 @@ -17,29 +17,27 @@ Name: laf-plugin +Version:1.0 +Release:0 Summary:Generic plugin framework for Java look-and-feels License:BSD-3-Clause and Zlib Group: Development/Libraries/Java # nanoxml distributed with laf-plugin is licensed under Zlib license while laf-plugin itself is BSD-3-Clause Url:https://java.net/projects/laf-plugin -Version:1.0 -Release:0 +# Upstream download URL https://laf-plugin.dev.java.net/files/documents/4261/50297/%{name}-all.zip seems dead +Source0:%{name}-all.zip +Source1:%{name}-build.xml BuildRequires: ant BuildRequires: dos2unix BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: unzip BuildRequires: update-alternatives -# BuildRequires: xerces-j2 BuildRequires: xmlbeans Requires: java = 1.5 Requires: jpackage-utils -# Requires: nanoxml-lite -BuildArch: noarch -# Upstream download URL https://laf-plugin.dev.java.net/files/documents/4261/50297/%{name}-all.zip seems dead -Source0:%{name}-all.zip -Source1:%{name}-build.xml BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The goal of this project is to provide a small infrastructure that @@ -49,7 +47,6 @@ %package javadoc Summary:Javadoc for laf-plugin Group: Documentation/HTML -PreReq: coreutils Recommends: %{name} = %{version} %description javadoc @@ -64,12 +61,12 @@ cp %{SOURCE1} build.xml rm -rf drop/* dos2unix src/org/jvnet/lafplugin/*.license -%__chmod 644 src/org/jvnet/lafplugin/*.license +chmod 644 src/org/jvnet/lafplugin/*.license %build -%ant all +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 all -%javadoc -quiet \ +javadoc -quiet \ -d doc \ -classpath ./build/classes50 \ -public \ @@ -78,7 +75,7 @@ %install export NO_BRP_CHECK_BYTECODE_VERSION=true # jars -%__install -Dm 644 drop/%{name}-50.jar %{buildroot}%{_javadir}/%{name}-50-%{version}.jar +install -Dm 644 drop/%{name}-50.jar %{buildroot}%{_javadir}/%{name}-50-%{version}.jar pushd %{buildroot}%{_javadir} 1/dev/null for jar in *-%{version}*; do ln -sf ${jar} $(echo $jar| sed s|-%{version}||g) @@ -87,16 +84,8 @@ popd 1/dev/null # javadoc -%__install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink - -%clean -[ -d %{buildroot} -a %{buildroot} != ] %__rm -rf %{buildroot} - -%post javadoc -%__rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} +install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ %files %defattr(-,root,root) @@ -106,6 +95,5 @@ %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jformatstring for openSUSE:Factory
Hello community, here is the log from the commit of package jformatstring for openSUSE:Factory checked in at 2014-07-11 20:05:46 Comparing /work/SRC/openSUSE:Factory/jformatstring (Old) and /work/SRC/openSUSE:Factory/.jformatstring.new (New) Package is jformatstring Changes: --- /work/SRC/openSUSE:Factory/jformatstring/jformatstring.changes 2014-06-30 22:49:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.jformatstring.new/jformatstring.changes 2014-07-11 20:05:47.0 +0200 @@ -1,0 +2,5 @@ +Mon Jul 7 15:04:27 UTC 2014 - tchva...@suse.com + +- Junit dep instead of junit4. + +--- Other differences: -- ++ jformatstring.spec ++ --- /var/tmp/diff_new_pack.dQM974/_old 2014-07-11 20:05:47.0 +0200 +++ /var/tmp/diff_new_pack.dQM974/_new 2014-07-11 20:05:47.0 +0200 @@ -1,9 +1,8 @@ # # spec file for package jformatstring # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,41 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# + + %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} %define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}} %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - %bcond_with gcj_support - %if %with gcj_support %define gcj_support 1 %else %define gcj_support 0 %endif - Name: jformatstring Version:0 -Release:0.3.20081016svn%{?dist} +Release:0 Summary:Java library for format string checks License:GPL-2.0 Group: Development/Libraries/Java Url:https://jformatstring.dev.java.net/ # svn -q export -r 8 https://jformatstring.dev.java.net/svn/jformatstring/trunk/jFormatString jformatstring-0 --username guest --password guest tar cjf jformatstring-0.tar.bz2 jformatstring-0 Source0:jformatstring-0.tar.bz2 -Provides: jFormatString = %{version}-%{release} -Obsoletes: jFormatString %{version}-%{release} BuildRequires: ant BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: junit4 +BuildRequires: junit +Provides: jFormatString = %{version}-%{release} +Obsoletes: jFormatString %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{gcj_support} BuildRequires: java-gcj-compat-devel %else BuildArch: noarch %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This project is derived from Sun's implementation of java.util.Formatter. It @@ -82,42 +79,37 @@ mkdir lib pushd lib -%{__ln_s} $(build-classpath junit4) +ln -s $(build-classpath junit) popd %build export CLASSPATH= export OPT_JAR_LIST=: -%{ant} -%{javadoc} -d javadoc \ - -source 1.5 \ +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 +javadoc -d javadoc \ -sourcepath src/java \ - -classpath build/classes:$(build-classpath junit4) \ + -classpath build/classes:$(build-classpath junit) \ -link %{_javadocdir}/java \ edu.umd.cs.findbugs.formatStringChecker %install -%{__rm} -rf %{buildroot} -%{__mkdir_p} %{buildroot}%{_javadir} -%{__cp} -p build/jFormatString.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jFormatString-%{version}.jar -%{__ln_s} jFormatString-%{version}.jar %{buildroot}%{_javadir}/jFormatString.jar - -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/jFormatString-%{version} -%{__ln_s} jFormatString-%{version} %{buildroot}%{_javadocdir}/jFormatString +mkdir -p %{buildroot}%{_javadir} +cp -p build/jFormatString.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jFormatString-%{version}.jar +ln -s jFormatString-%{version}.jar %{buildroot}%{_javadir}/jFormatString.jar + +mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr javadoc/*
commit libKF5ModemManagerQt for openSUSE:Factory
Hello community, here is the log from the commit of package libKF5ModemManagerQt for openSUSE:Factory checked in at 2014-07-11 20:05:42 Comparing /work/SRC/openSUSE:Factory/libKF5ModemManagerQt (Old) and /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new (New) Package is libKF5ModemManagerQt Changes: New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:Factory/.libKF5ModemManagerQt.new/libKF5ModemManagerQt.changes 2014-07-11 20:05:43.0 +0200 @@ -0,0 +1,5 @@ +--- +Thu Jul 3 21:45:39 UTC 2014 - hrvoje.sen...@gmail.com + +- Activate libKF5ModemManagerQt package + New: fix_build.diff libKF5ModemManagerQt.changes libKF5ModemManagerQt.spec libmm-qt-5.0.90.tar.xz Other differences: -- ++ libKF5ModemManagerQt.spec ++ # # spec file for package libKF5ModemManagerQt # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # 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/ # Url:http://www.kde.org %define soversion 5 Name: libKF5ModemManagerQt Version:5.0.90 Release:0 Summary:Qt wrapper for ModemManager DBus API License:LGPL-2.1 or LGPL-3.0 Group: System/GUI/KDE Source: http://download.kde.org/unstable/plasma/4.98.0/src/libmm-qt-%{version}.tar.xz Patch0: fix_build.diff BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig(ModemManager) BuildRequires: pkgconfig(Qt5Core) = 5.2.0 BuildRequires: pkgconfig(Qt5DBus) = 5.2.0 BuildRequires: pkgconfig(Qt5Network) = 5.2.0 BuildRequires: pkgconfig(Qt5Test) = 5.2.0 BuildRequires: pkgconfig(Qt5Xml) = 5.2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Qt5 wrapper for ModemManager DBus API. %package devel Summary:Development package for the libmm-qt library Group: Development/Libraries/KDE Requires: libKF5ModemManagerQt%{soversion} = %{version} Requires: pkgconfig(ModemManager) = 0.8 Requires: pkgconfig(Qt5Core) = 5.2.0 Requires: pkgconfig(Qt5DBus) = 5.2.0 Requires: pkgconfig(Qt5Network) = 5.2.0 Requires: pkgconfig(Qt5Xml) = 5.2.0 %description devel Qt5 wrapper for ModemManager DBus API. Development files. %package -n libKF5ModemManagerQt%{soversion} Summary:Qt wrapper around the ModemManager libraries Group: Development/Libraries/KDE %description -n libKF5ModemManagerQt%{soversion} Qt5 wrapper for ModemManager DBus API. %prep %setup -q -n libmm-qt-%{version} %patch0 -p1 %build %cmake_kf5 -d build %make_jobs %install %kf5_makeinstall -C build %post -n libKF5ModemManagerQt%{soversion} -p /sbin/ldconfig %postun -n libKF5ModemManagerQt%{soversion} -p /sbin/ldconfig %files -n libKF5ModemManagerQt%{soversion} %defattr(-,root,root) %doc README COPYING.LIB %{_kf5_libdir}/libKF5ModemManagerQt.so.* %files devel %defattr(-,root,root) %{_kf5_libdir}/libKF5ModemManagerQt.so %{_kf5_includedir}/ModemManagerQt/ %{_kf5_includedir}/*.h %{_kf5_libdir}/cmake/KF5ModemManagerQt/ %{_kf5_mkspecsdir}/qt_ModemManagerQt.pri %changelog ++ fix_build.diff ++ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fccc638..beeaa53 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,9 +17,7 @@ set(ModemManagerQt_SRCS modemfirmware.cpp modemlocation.cpp modemmessaging.cpp -modemsignal.cpp modemtime.cpp -modemoma.cpp sim.cpp sms.cpp ) @@ -34,8 +32,6 @@ set(DBUS_INTERFACES_FILES dbus/modemcdmainterface.cpp dbus/modeminterface.cpp dbus/modemmanager1interface.cpp - dbus/omainterface.cpp - dbus/signalinterface.cpp dbus/siminterface.cpp dbus/simpleinterface.cpp dbus/smsinterface.cpp @@ -43,6 +39,20 @@ set(DBUS_INTERFACES_FILES dbus/ussdinterface.cpp ) +if (${MODEMMANAGER_VERSION} VERSION_EQUAL 1.2.0 OR ${MODEMMANAGER_VERSION} VERSION_GREATER 1.2.0) +set(ModemManagerQt_SRCS +${ModemManagerQt_SRCS} +modemoma.cpp +modemsignal.cpp +) + +set(DBUS_INTERFACES_FILES +
commit jrosetta for openSUSE:Factory
Hello community, here is the log from the commit of package jrosetta for openSUSE:Factory checked in at 2014-07-11 20:05:53 Comparing /work/SRC/openSUSE:Factory/jrosetta (Old) and /work/SRC/openSUSE:Factory/.jrosetta.new (New) Package is jrosetta Changes: --- /work/SRC/openSUSE:Factory/jrosetta/jrosetta.changes2014-06-30 22:50:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.jrosetta.new/jrosetta.changes 2014-07-11 20:05:54.0 +0200 @@ -1,0 +2,10 @@ +Tue Jul 8 09:23:15 UTC 2014 - tchva...@suse.com + +- Fix sle11 build bit better. + +--- +Mon Jul 7 15:06:28 UTC 2014 - tchva...@suse.com + +- Use junit not junit4 dep. + +--- Other differences: -- ++ jrosetta.spec ++ --- /var/tmp/diff_new_pack.2XCu63/_old 2014-07-11 20:05:55.0 +0200 +++ /var/tmp/diff_new_pack.2XCu63/_new 2014-07-11 20:05:55.0 +0200 @@ -29,7 +29,7 @@ BuildRequires: ant-junit BuildRequires: java-devel = 1.6 BuildRequires: jpackage-utils = 1.5 -BuildRequires: junit4 +BuildRequires: junit BuildRequires: unzip Requires: java = 1.6 Requires: jpackage-utils = 1.5 @@ -52,18 +52,16 @@ %build cd jrosetta-api ant \ +-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ build-jar cd ../jrosetta-engine ant \ +-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Djava.encoding=UTF-8 \ build-jar %install -%if 0%{?suse_version} == 1110 -export NO_BRP_CHECK_BYTECODE_VERSION=true -%endif - mkdir -p %{buildroot}%{_javadir} cp -p %{name}-api/build/%{name}-API-%{version}.jar \ %{buildroot}%{_javadir}/%{name}-API-%{version}.jar -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit netbeans-javaparser for openSUSE:Factory
Hello community, here is the log from the commit of package netbeans-javaparser for openSUSE:Factory checked in at 2014-07-11 20:05:57 Comparing /work/SRC/openSUSE:Factory/netbeans-javaparser (Old) and /work/SRC/openSUSE:Factory/.netbeans-javaparser.new (New) Package is netbeans-javaparser Changes: --- /work/SRC/openSUSE:Factory/netbeans-javaparser/netbeans-javaparser.changes 2013-09-11 13:38:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.netbeans-javaparser.new/netbeans-javaparser.changes 2014-07-11 20:05:57.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:54:41 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-nodeps. + +--- Other differences: -- ++ netbeans-javaparser.spec ++ --- /var/tmp/diff_new_pack.s3s9Ox/_old 2014-07-11 20:05:58.0 +0200 +++ /var/tmp/diff_new_pack.s3s9Ox/_new 2014-07-11 20:05:58.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package netbeans-javaparser # -# 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 @@ -18,7 +18,6 @@ # Prevent brp-java-repack-jars from being run. %define __jar_repack %{nil} - Name: netbeans-javaparser Version:6.8 Release:0 @@ -33,17 +32,13 @@ # hg update -r 1c46268162cd # tar -czvf ../nb-javac-6.8.tar.gz . Source0:nb-javac-%{version}.tar.bz2 - BuildRequires: ant -BuildRequires: ant-nodeps BuildRequires: java-devel = 1.6.0 BuildRequires: javapackages-tools - Requires: java = 1.6.0 Requires: javapackages-tools - -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Java parser to analyse Java source files inside of the NetBeans IDE @@ -51,22 +46,19 @@ %prep %setup -q -c # remove all binary libs -find . -name *.jar -exec %__rm -f {} \; +find . -name *.jar -exec rm -f {} \; %build [ -z $JAVA_HOME ] export JAVA_HOME=%{_jvmdir}/java -%ant -f make/netbeans/nb-javac/build.xml jar +ant -f make/netbeans/nb-javac/build.xml jar %install # jar -%__install -d -m 755 %{buildroot}%{_javadir} -%__install -m 644 make/netbeans/nb-javac/dist/javac-api.jar %{buildroot}%{_javadir}/%{name}-api-%{version}.jar -%__ln_s %{name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar -%__install -m 644 make/netbeans/nb-javac/dist/javac-impl.jar %{buildroot}%{_javadir}/%{name}-impl-%{version}.jar -%__ln_s %{name}-impl-%{version}.jar %{buildroot}%{_javadir}/%{name}-impl.jar - -%clean -%__rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 make/netbeans/nb-javac/dist/javac-api.jar %{buildroot}%{_javadir}/%{name}-api-%{version}.jar +ln -s %{name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar +install -m 644 make/netbeans/nb-javac/dist/javac-impl.jar %{buildroot}%{_javadir}/%{name}-impl-%{version}.jar +ln -s %{name}-impl-%{version}.jar %{buildroot}%{_javadir}/%{name}-impl.jar %files %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jogl2 for openSUSE:Factory
Hello community, here is the log from the commit of package jogl2 for openSUSE:Factory checked in at 2014-07-11 20:05:52 Comparing /work/SRC/openSUSE:Factory/jogl2 (Old) and /work/SRC/openSUSE:Factory/.jogl2.new (New) Package is jogl2 Changes: --- /work/SRC/openSUSE:Factory/jogl2/jogl2.changes 2014-05-06 17:40:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.jogl2.new/jogl2.changes 2014-07-11 20:05:53.0 +0200 @@ -1,0 +2,5 @@ +Mon Jul 7 15:05:52 UTC 2014 - tchva...@suse.com + +- Use junit not junit4 + +--- Other differences: -- ++ jogl2.spec ++ --- /var/tmp/diff_new_pack.z4DP2m/_old 2014-07-11 20:05:54.0 +0200 +++ /var/tmp/diff_new_pack.z4DP2m/_new 2014-07-11 20:05:54.0 +0200 @@ -16,10 +16,10 @@ # +%define src_name jogl-v%{version} Name: jogl2 Version:2.0.2 Release:0 -%define src_name jogl-v%{version} Summary:Java bindings for the OpenGL API License:BSD-2-Clause Group: Development/Libraries/Java @@ -27,7 +27,6 @@ Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.7z Patch0: %{name}--update-antlr-ant-contrib-jars.patch Patch1: %{name}-0001-update-ant-contrib-tasks.patch - BuildRequires: ant = 1.8.0 BuildRequires: ant-contrib BuildRequires: eclipse-swt @@ -39,11 +38,9 @@ BuildRequires: libXt-devel BuildRequires: libXxf86vm-devel BuildRequires: p7zip - Requires: gluegen2 Requires: java Requires: jpackage-utils - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,9 +55,9 @@ %prep # Upstream tarball is a .7z archive, which extracts to a .tar, which has to be further extracted to get the full source -%setup -c -T -n %{src_name} +%setup -q -c -T -n %{src_name} cd .. -/usr/bin/7za e -y %{SOURCE0} +%{_bindir}/7za e -y %{SOURCE0} tar -xf %{src_name}.tar rm %{src_name}.tar cd %{src_name} @@ -98,13 +95,13 @@ %build cd make export CLASSPATH= -%ant -Dcommon.gluegen.build.done=true \ +ant-Dcommon.gluegen.build.done=true \ -Djavacdebug=true \ -Djavacdebuglevel=lines,vars,source \ -Dc.compiler.debug=true \ \ -Dantlr.jar=%{_javadir}/antlr.jar \ --Djunit.jar=%{_javadir}/junit4.jar \ +-Djunit.jar=%{_javadir}/junit.jar \ -Dant.jar=%{_javadir}/ant.jar \ -Dant-junit.jar=%{_javadir}/ant/ant-junit.jar \ -Dgluegen.jar=%{_javadir}/gluegen2.jar \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit bluez for openSUSE:Factory
Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2014-07-11 20:05:28 Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new (New) Package is bluez Changes: --- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2014-05-26 19:53:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2014-07-11 20:05:32.0 +0200 @@ -1,0 +2,28 @@ +Sun Jul 6 11:47:10 UTC 2014 - seife+...@b1-systems.com + +- update to version 5.21 + Bugfixes and improvements throughout the tree. Fixes to + bluetoothctl to allow using it for scripting. + An important detail of this release is that it supports several + new features that are on their way to the 3.17 kernel. Perhaps + the most important one of these is LE passive scanning. When + run on a kernel that supports it, instead of doing a kind of + fake background scanning using the Start Discovery command, + bluetoothd will now tell the kernel the relevant information and + the kernel will then commence passive scanning for devices. +- remove bluez-5.20-fix-queue.patch (fixed upstream) + +--- +Fri Jun 27 10:56:22 UTC 2014 - seife+...@b1-systems.com + +- add bluez-5.20-fix-queue.patch to fix test case failure + +--- +Sat Jun 21 21:30:12 UTC 2014 - seife+...@b1-systems.com + +- update to version 5.20 + For non-Android related parts this is mostly a bug-fix release + with minor fixes here and there as well as improved handling of + PS3 controllers. + +--- Old: bluez-5.19.tar.xz New: bluez-5.21.tar.xz Other differences: -- ++ bluez.spec ++ --- /var/tmp/diff_new_pack.NsCQM1/_old 2014-07-11 20:05:33.0 +0200 +++ /var/tmp/diff_new_pack.NsCQM1/_new 2014-07-11 20:05:33.0 +0200 @@ -24,7 +24,7 @@ BuildRequires: systemd-devel BuildRequires: pkgconfig(dbus-1) = 1.4 %{?systemd_requires} -Version:5.19 +Version:5.21 Release:0 Summary:Bluetooth Stack for Linux License:GPL-2.0+ ++ bluez-5.19.tar.xz - bluez-5.21.tar.xz ++ 30999 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit netbeans-svnclientadapter for openSUSE:Factory
Hello community, here is the log from the commit of package netbeans-svnclientadapter for openSUSE:Factory checked in at 2014-07-11 20:05:58 Comparing /work/SRC/openSUSE:Factory/netbeans-svnclientadapter (Old) and /work/SRC/openSUSE:Factory/.netbeans-svnclientadapter.new (New) Package is netbeans-svnclientadapter Changes: --- /work/SRC/openSUSE:Factory/netbeans-svnclientadapter/netbeans-svnclientadapter.changes 2013-09-11 13:38:16.0 +0200 +++ /work/SRC/openSUSE:Factory/.netbeans-svnclientadapter.new/netbeans-svnclientadapter.changes 2014-07-11 20:05:59.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:54:06 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-nodeps. + +--- Other differences: -- ++ netbeans-svnclientadapter.spec ++ --- /var/tmp/diff_new_pack.Q86pp4/_old 2014-07-11 20:06:00.0 +0200 +++ /var/tmp/diff_new_pack.Q86pp4/_new 2014-07-11 20:06:00.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package netbeans-svnclientadapter # -# 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,23 +17,18 @@ %global __jar_repack %{nil} - %global nb_netbeans %global nb_org %{nb_}.org %global nb_ver 6.7.1 - %global svnCA svnClientAdapter %global svnCA_ver 1.6.0 - Name: netbeans-svnclientadapter Version:%{nb_ver} -Release:2%{?dist} +Release:0 Summary:Subversion Client Adapter License:Apache-2.0 Group: Development/Libraries/Java - Url:http://subclipse.tigris.org/svnClientAdapter.html - # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: # svn export --force --username guest -r4383 \ @@ -42,20 +37,16 @@ # tar -czvf svnClientAdapter-1.6.0.tar.gz svnClientAdapter-1.6.0 Source0:%{svnCA}-%{svnCA_ver}.tar.bz2 Patch0: %{svnCA}-%{svnCA_ver}-build.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-nodeps BuildRequires: java-devel = 1.6.0 BuildRequires: javapackages-tools BuildRequires: subversion-javahl - Requires: java = 1.6.0 Requires: javapackages-tools Requires: subversion +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description SVNClientAdapter is a high-level Java API for Subversion. @@ -64,11 +55,11 @@ %setup -q -n %{svnCA}-%{svnCA_ver} # remove all binary libs -find . -name *.jar -exec %{__rm} -f {} \; +find . -name *.jar -exec rm -f {} \; %patch0 -p1 -b .sav -%{__ln_s} -f %{_javadir}/svnkit-javahl.jar lib/svnjavahl.jar +ln -s -f %{_javadir}/svnkit-javahl.jar lib/svnjavahl.jar %build [ -z $JAVA_HOME ] export JAVA_HOME=%{_jvmdir}/java @@ -76,12 +67,9 @@ %install # jar -%{__install} -d -m 755 %{buildroot}%{_javadir} -%{__install} -m 644 build/lib/svnClientAdapter.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -%clean -%{__rm} -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 build/lib/svnClientAdapter.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar %files %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit postgresql-jdbc for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql-jdbc for openSUSE:Factory checked in at 2014-07-11 20:05:59 Comparing /work/SRC/openSUSE:Factory/postgresql-jdbc (Old) and /work/SRC/openSUSE:Factory/.postgresql-jdbc.new (New) Package is postgresql-jdbc Changes: --- /work/SRC/openSUSE:Factory/postgresql-jdbc/postgresql-jdbc.changes 2014-06-30 22:50:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql-jdbc.new/postgresql-jdbc.changes 2014-07-11 20:06:01.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:34:41 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-trax. + +--- Other differences: -- ++ postgresql-jdbc.spec ++ --- /var/tmp/diff_new_pack.1iwBE5/_old 2014-07-11 20:06:02.0 +0200 +++ /var/tmp/diff_new_pack.1iwBE5/_new 2014-07-11 20:06:02.0 +0200 @@ -26,7 +26,6 @@ Url:http://jdbc.postgresql.org Source0: http://jdbc.postgresql.org/download/%{name}-%{version}-%{buildnum}.src.tar.gz BuildRequires: ant -BuildRequires: ant-trax BuildRequires: java-devel BuildRequires: javapackages-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libjnidispatch for openSUSE:Factory
Hello community, here is the log from the commit of package libjnidispatch for openSUSE:Factory checked in at 2014-07-11 20:05:55 Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old) and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New) Package is libjnidispatch Changes: --- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes 2013-12-18 12:32:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes 2014-07-11 20:05:57.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:50:16 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-trax and run spec-cleaner. + +--- Other differences: -- ++ libjnidispatch.spec ++ --- /var/tmp/diff_new_pack.id1FwI/_old 2014-07-11 20:05:57.0 +0200 +++ /var/tmp/diff_new_pack.id1FwI/_new 2014-07-11 20:05:57.0 +0200 @@ -1,9 +1,8 @@ # # spec file for package libjnidispatch # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +18,12 @@ Name: libjnidispatch -Url:https://github.com/twall/jna Version:3.4.0 Release:0 - Summary:Java Native Access (shared library) License:LGPL-2.1+ Group: Development/Libraries/Java +Url:https://github.com/twall/jna #wget https://github.com/twall/jna/tarball/3.4.0 #tar -xf twall-jna-3.4.0-0-ge9da3c6.tar.bz2 #find twall-jna-3e5b84f/ -name '*jar' | xargs rm @@ -36,68 +34,21 @@ Patch0: jna-%{version}-build.patch Patch1: libffi-aarch64.patch Patch2: libffi-ppc64le.patch -%if 0%{?mdkversion} 201100 -BuildArch: i586 x86_64 ppc ppc64 ppc64le aarch64 -%endif -Requires(post): javapackages-tools -Requires(postun): javapackages-tools -Requires: java = 1.5.0 BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-nodeps -BuildRequires: ant-trax BuildRequires: java-devel = 1.5.0 BuildRequires: javapackages-tools -# ant variable -%if ! 0%{?suse_version} -%define ant JAVA_HOME=/usr/lib/jvm/java ant -%endif -# libx differences -%if 0%{?centos_version} || 0%{?fedora} -BuildRequires: libX11-devel -BuildRequires: libXt-devel -%endif -%if 0%{?centos_version} 505 || 0%{?fedora} -BuildRequires: java-devel = 1.6.0 -%endif -%if 0%{?centos_version} 505 -BuildRequires: saxon -%endif -%if 0%{?mandriva_version} -%ifarch x86_64 -%define _lib lib64 -%else -%define _lib lib -%endif -%if 0%{?mdkversion} 201010 -BuildRequires: %{_lib}x11-devel -%else -BuildRequires: %{_lib}x11_6-devel -%endif -%if 0%{?mdkversion} = 201010 -BuildRequires: %{_lib}xt-devel -%else -BuildRequires: %{_lib}xt6-devel -%endif -%endif -%if 0%{?suse_version} -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXt-devel -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Requires: java = 1.5.0 Provides: jna-native = %{version}-%{release} Obsoletes: jna-native %{version}-%{release} -# centos does not know recommends -%if ! 0%{?centos_version} ! 0%{?fedora} -Recommends: jna -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXt-devel %description Native library stub to dynamically invoke native code used by Java Native Access library. - %package-n jna Summary:Java Native Access Group: Development/Libraries/Java @@ -124,7 +75,6 @@ BuildArch: noarch %description-n jna-javadoc - %{summary}. %prep @@ -140,38 +90,33 @@ %build -%{ant} \ +ant \ jar \ native \ platform-jar \ -Dcflags_extra.native=%{optflags} \ javadoc -#compile-tests \ -#test \ -# with correct soname one test fails, TODO - %install - if [ -d build-d64 ]; then suffix=-d64 fi -install -d -m 755 $RPM_BUILD_ROOT%{_libdir} -install -p -m 644 build${suffix}/native/libjnidispatch.so $RPM_BUILD_ROOT%{_libdir}/libjnidispatch.so +install -d -m 755 %{buildroot}%{_libdir} +install -p -m 644 build${suffix}/native/libjnidispatch.so %{buildroot}%{_libdir}/libjnidispatch.so -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 build${suffix}/jna.jar $RPM_BUILD_ROOT%{_javadir}/jna.jar -install -p -m 644 ./contrib/platform/dist/platform.jar $RPM_BUILD_ROOT%{_javadir}/platform.jar +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 build${suffix}/jna.jar
commit mkvtoolnix for openSUSE:Factory
Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2014-07-11 20:06:10 Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) Package is mkvtoolnix Changes: --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes2014-04-30 15:08:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2014-07-11 20:06:12.0 +0200 @@ -1,0 +2,6 @@ +Fri Jul 11 16:19:01 UTC 2014 - reddw...@opensuse.org + +- Update to 7.0.0 + * mkvmkerge will now write certain track-specific statistics (such as bit rate) as tags. + +--- Old: mkvtoolnix-6.9.1.tar.xz New: mkvtoolnix-7.0.0.tar.xz Other differences: -- ++ mkvtoolnix.spec ++ --- /var/tmp/diff_new_pack.rbBPzk/_old 2014-07-11 20:06:13.0 +0200 +++ /var/tmp/diff_new_pack.rbBPzk/_new 2014-07-11 20:06:13.0 +0200 @@ -17,7 +17,7 @@ Name: mkvtoolnix -Version:6.9.1 +Version:7.0.0 Release:0 Summary:Tools to Create, Alter, and Inspect Matroska Files License:GPL-2.0+ ++ mkvtoolnix-6.9.1.tar.xz - mkvtoolnix-7.0.0.tar.xz ++ 115996 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tanukiwrapper for openSUSE:Factory
Hello community, here is the log from the commit of package tanukiwrapper for openSUSE:Factory checked in at 2014-07-11 20:06:04 Comparing /work/SRC/openSUSE:Factory/tanukiwrapper (Old) and /work/SRC/openSUSE:Factory/.tanukiwrapper.new (New) Package is tanukiwrapper Changes: --- /work/SRC/openSUSE:Factory/tanukiwrapper/tanukiwrapper.changes 2013-09-14 20:30:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.tanukiwrapper.new/tanukiwrapper.changes 2014-07-11 20:06:05.0 +0200 @@ -1,0 +2,10 @@ +Tue Jul 8 10:52:25 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-nodeps. + +--- +Mon Jul 7 15:07:30 UTC 2014 - tchva...@suse.com + +- Use junit not junit4 dep. + +--- Other differences: -- ++ tanukiwrapper.spec ++ --- /var/tmp/diff_new_pack.9TM0nk/_old 2014-07-11 20:06:06.0 +0200 +++ /var/tmp/diff_new_pack.9TM0nk/_new 2014-07-11 20:06:06.0 +0200 @@ -1,9 +1,8 @@ # # spec file for package tanukiwrapper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2006, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +17,6 @@ # -%define sectionfree - Name: tanukiwrapper Version:3.2.3 Release:0 @@ -39,11 +36,10 @@ Patch6: %{name}-Makefile-aarch64.patch BuildRequires: ant = 1.6.1 BuildRequires: ant-junit -BuildRequires: ant-nodeps = 1.6.1 BuildRequires: glibc-devel BuildRequires: java-devel BuildRequires: javapackages-tools -BuildRequires: junit4 +BuildRequires: junit BuildRequires: perl BuildRequires: unzip BuildRequires: xerces-j2 @@ -102,49 +98,45 @@ %patch3 %patch4 %patch6 -p1 -find . -name *.jar -exec %__rm -f {} \; -%__perl -p -i -e 's/\r//' doc/AUTHORS -%__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile* -%__perl -p -e \ +find . -name *.jar -exec rm -f {} \; +perl -p -i -e 's/\r//' doc/AUTHORS +perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile* +perl -p -e \ 's|=\.\./lib/wrapper\.jar$|=%{_javadir}/%{name}.jar| ; s|=\.\./lib$|=%{_libdir}|' \ src/conf/wrapper.conf.in wrapper.conf.sample -%__perl -p -e \ +perl -p -e \ 's|\./wrapper|%{_sbindir}/%{name}| ; s|\.\./conf/wrapper\.conf|/path/to/wrapper.conf|' \ src/bin/sh.script.in script.sh.sample %build -export CLASSPATH=$(build-classpath ant junit4 xerces-j2 xml-commons-apis) +export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis) %ifarch x86_64 ia64 ppc64 sparc64 s390x aarch64 bits=64 %else bits=32 %endif -%ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \ +ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \ main jdoc %install -%__rm -rf %{buildroot} # jar -%__mkdir_p %{buildroot}%{_javadir} -%__install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar +mkdir -p %{buildroot}%{_javadir} +install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar # jni -%__install -d -m 755 %{buildroot}%{_libdir} -%__install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir} +install -d -m 755 %{buildroot}%{_libdir} +install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir} # commands -%__install -d -m 755 %{buildroot}%{_sbindir} -%__install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name} +install -d -m 755 %{buildroot}%{_sbindir} +install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name} # javadoc -%__install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -%__cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name} - -%clean -%__rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit skinlf for openSUSE:Factory
Hello community, here is the log from the commit of package skinlf for openSUSE:Factory checked in at 2014-07-11 20:06:01 Comparing /work/SRC/openSUSE:Factory/skinlf (Old) and /work/SRC/openSUSE:Factory/.skinlf.new (New) Package is skinlf Changes: --- /work/SRC/openSUSE:Factory/skinlf/skinlf.changes2014-05-06 17:40:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.skinlf.new/skinlf.changes 2014-07-11 20:06:02.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:16:37 UTC 2014 - tchva...@suse.com + +- Cleanup a bit with spec-cleaner for readability. + +--- Other differences: -- ++ skinlf.spec ++ --- /var/tmp/diff_new_pack.19QHJ9/_old 2014-07-11 20:06:02.0 +0200 +++ /var/tmp/diff_new_pack.19QHJ9/_new 2014-07-11 20:06:02.0 +0200 @@ -16,20 +16,24 @@ # +%define _version2 20060722 Name: skinlf +Version:6.7 +Release:0 Summary:Allows developers to write skinnable application using the Swing toolkit -# Included software nanoxml is licensed under zlib, while skinlf is itself Apache-1.1 License:Apache-1.1 and Zlib Group: Development/Libraries/Java +# Included software nanoxml is licensed under zlib, while skinlf is itself Apache-1.1 Url:http://skinlf.l2fprod.com/index.html -Version:6.7 -Release:0 -%define _version2 20060722 -BuildArch: noarch +# Upstream download link https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip seems dead +Source0:%{name}-%{version}-%{_version2}.tar.bz2 +Source1:imageconversion.jar +Source2:%{name}-build.xml +Source3:%{name}-resources.tar.bz2 +Patch1: skinlf-no-jimi.patch BuildRequires: ant BuildRequires: dos2unix BuildRequires: java-devel = 1.5 -# BuildRequires: jimi = 1.0 BuildRequires: jpackage-utils BuildRequires: laf-plugin BuildRequires: xalan-j2 @@ -37,13 +41,8 @@ Requires: jpackage-utils Requires: laf-plugin Requires: xalan-j2 -# Upstream download link https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip seems dead -Source0:%{name}-%{version}-%{_version2}.tar.bz2 -Source1:imageconversion.jar -Source2:%{name}-build.xml -Source3:%{name}-resources.tar.bz2 -Patch1: skinlf-no-jimi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Skin Look And Feel allows Java developers to write skinnable application using @@ -54,7 +53,6 @@ Look And Feel (aka SkinLF) also includes NativeSkin to create irregular windows. - %package javadoc Summary:Javadoc for %{name} Group: Documentation/HTML @@ -88,60 +86,58 @@ This package provides a few demo examples for %{name}. %prep -%setup -q -n %{name}-%{version} -a3 -%__cp %{SOURCE1} . -%__cp %{SOURCE2} build.xml +%setup -q -a3 +cp %{SOURCE1} . +cp %{SOURCE2} build.xml for i in AUTHORS CHANGES INSTALL LICENSE LICENSE_nanoxml README THANKS; do dos2unix -o $i - %__chmod 644 $i + chmod 644 $i done %patch1 %build -%ant jar javadocs +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadocs %install -export NO_BRP_CHECK_BYTECODE_VERSION=true # jars -%__install -dm 755 %{buildroot}%{_javadir} -%__install -pm 644 lib/%{name}.jar \ +install -dm 755 %{buildroot}%{_javadir} +install -pm 644 lib/%{name}.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed s|-%{version}||g`; done) # javadoc -%__install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -%__cp -pr docs/* \ +install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr docs/* \ %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink # demo -%__install -dm 755 %{buildroot}%{_datadir}/%{name} -%__install -m 644 lib/%{name}_demo.jar \ +install -dm 755 %{buildroot}%{_datadir}/%{name} +install -m 644 lib/%{name}_demo.jar \ %{buildroot}%{_datadir}/%{name} -%__install -m 644 lib/themepack.zip \ +install -m 644 lib/themepack.zip \ %{buildroot}%{_datadir}/%{name} # create startscripts for demo-apps %if 0 # not supported for linux -%__cat bin/clock.sh EOF +cat bin/clock.sh EOF #!/bin/bash %{java} -cp %{_javadir}/%{name}.jar:%{_javadir}/laf-plugin.jar:%{_datadir}/%{name}/%{name}_demo.jar examples.Clock clock.gif EOF # not supported for linux -%__cat bin/region.sh EOF +cat bin/region.sh EOF #!/bin/bash %{java} -cp
commit swingx for openSUSE:Factory
Hello community, here is the log from the commit of package swingx for openSUSE:Factory checked in at 2014-07-11 20:06:02 Comparing /work/SRC/openSUSE:Factory/swingx (Old) and /work/SRC/openSUSE:Factory/.swingx.new (New) Package is swingx Changes: --- /work/SRC/openSUSE:Factory/swingx/swingx.changes2014-06-30 22:50:23.0 +0200 +++ /work/SRC/openSUSE:Factory/.swingx.new/swingx.changes 2014-07-11 20:06:03.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:53:18 UTC 2014 - tchva...@suse.com + +- Do not depend on ant-nodeps. + +--- Other differences: -- ++ swingx.spec ++ --- /var/tmp/diff_new_pack.JqzGB2/_old 2014-07-11 20:06:04.0 +0200 +++ /var/tmp/diff_new_pack.JqzGB2/_new 2014-07-11 20:06:04.0 +0200 @@ -33,13 +33,10 @@ # Don't do the demo taglet stuff Patch2: swingx-0.9.4-swinglabs-build-impl.patch BuildRequires: ant -BuildRequires: ant-nodeps BuildRequires: batik BuildRequires: java-devel = 1.6.0 BuildRequires: javapackages-tools Requires: java = 1.6.0 -Requires(post): javapackages-tools -Requires(postun): javapackages-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libgaminggear for openSUSE:Factory
Hello community, here is the log from the commit of package libgaminggear for openSUSE:Factory checked in at 2014-07-11 20:06:09 Comparing /work/SRC/openSUSE:Factory/libgaminggear (Old) and /work/SRC/openSUSE:Factory/.libgaminggear.new (New) Package is libgaminggear Changes: --- /work/SRC/openSUSE:Factory/libgaminggear/libgaminggear.changes 2014-06-24 22:47:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.libgaminggear.new/libgaminggear.changes 2014-07-11 20:06:10.0 +0200 @@ -1,0 +2,5 @@ +Sat Jul 5 12:33:51 UTC 2014 - mailaen...@opensuse.org + +- update to version 0.4.0 + +--- Old: libgaminggear-0.3.0.tar.bz2 New: libgaminggear-0.4.0.tar.bz2 Other differences: -- ++ libgaminggear.spec ++ --- /var/tmp/diff_new_pack.p8CzDZ/_old 2014-07-11 20:06:11.0 +0200 +++ /var/tmp/diff_new_pack.p8CzDZ/_new 2014-07-11 20:06:11.0 +0200 @@ -17,7 +17,7 @@ %define majorversion 0 -%define minorversion 3 +%define minorversion 4 %define microversion 0 Name: libgaminggear Version:%{majorversion}.%{minorversion}.%{microversion} @@ -33,6 +33,9 @@ BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(gtk+-2.0) = 2.20 +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(sqlite3) = 3.7 Requires(pre): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build ++ libgaminggear-0.3.0.tar.bz2 - libgaminggear-0.4.0.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.3.0/CMakeLists.txt new/libgaminggear-0.4.0/CMakeLists.txt --- old/libgaminggear-0.3.0/CMakeLists.txt 2014-06-05 15:41:06.0 +0200 +++ new/libgaminggear-0.4.0/CMakeLists.txt 2014-07-04 14:37:43.0 +0200 @@ -22,7 +22,9 @@ INCLUDE(INSTALL_PKGCONFIGDIR) INCLUDE(UINPUT) +FIND_PACKAGE(CANBERRA REQUIRED) FIND_PACKAGE(GTK REQUIRED) +FIND_PACKAGE(NOTIFY REQUIRED) FIND_PACKAGE(SQLITE3 3.7) CONFIGURE_FILE( @@ -35,13 +37,15 @@ ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) SET(V_MAJOR 0) -SET(V_MINOR 3) +SET(V_MINOR 4) SET(V_MICRO 0) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include + ${CANBERRA_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} + ${NOTIFY_INCLUDE_DIRS} ) ADD_SUBDIRECTORY(configuration) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.3.0/Changelog new/libgaminggear-0.4.0/Changelog --- old/libgaminggear-0.3.0/Changelog 2014-06-05 15:41:06.0 +0200 +++ new/libgaminggear-0.4.0/Changelog 2014-07-04 14:37:43.0 +0200 @@ -1,3 +1,7 @@ +0.4.0 2014-07-04 + + * Added GaminggearAudioNotificator and GaminggearScreenNotificator + 0.3.0 2014-06-05 * Added WITHOUT_DOC build option @@ -13,4 +17,4 @@ 0.1.0 2014-04-13 * initial version - \ No newline at end of file + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.3.0/cmake_modules/FindCANBERRA.cmake new/libgaminggear-0.4.0/cmake_modules/FindCANBERRA.cmake --- old/libgaminggear-0.3.0/cmake_modules/FindCANBERRA.cmake1970-01-01 01:00:00.0 +0100 +++ new/libgaminggear-0.4.0/cmake_modules/FindCANBERRA.cmake2014-07-04 14:37:43.0 +0200 @@ -0,0 +1,28 @@ +# Stefan Achatz 2012 +# +# Tries to find libcanberra and sets following variables according to found capabilities: +# +# CANBERRA_FOUND +# CANBERRA_INCLUDE_DIRS +# CANBERRA_LIBRARIES + +FIND_PACKAGE(PkgConfig) +PKG_CHECK_MODULES(PKG_CANBERRA libcanberra) + +FIND_PATH(CANBERRA_INCLUDE_DIRS canberra.h + HINTS +${PKG_CANBERRA_INCLUDE_DIRS} +${PKG_CANBERRA_INCLUDEDIR} +) + +FIND_LIBRARY(CANBERRA_LIBRARIES canberra + HINTS ${PKG_CANBERRA_LIBRARY_DIRS} +) + +IF(CANBERRA_LIBRARIES AND CANBERRA_INCLUDE_DIRS) + SET(CANBERRA_FOUND true) +ENDIF() + +IF(CANBERRA_FIND_REQUIRED AND NOT CANBERRA_FOUND) + MESSAGE(FATAL_ERROR Could not find CANBERRA) +ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgaminggear-0.3.0/cmake_modules/FindNOTIFY.cmake new/libgaminggear-0.4.0/cmake_modules/FindNOTIFY.cmake --- old/libgaminggear-0.3.0/cmake_modules/FindNOTIFY.cmake 1970-01-01 01:00:00.0 +0100 +++ new/libgaminggear-0.4.0/cmake_modules/FindNOTIFY.cmake 2014-07-04 14:37:43.0 +0200 @@ -0,0 +1,46 @@ +# Stefan Achatz 2012 +# +# Tries to find libnotify and sets following variables according to found capabilities: +# +# NOTIFY_FOUND +# NOTIFY_INCLUDE_DIRS +#
commit crmsh for openSUSE:Factory
Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-07-11 20:06:07 Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) Package is crmsh Changes: --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-07-02 15:05:16.0 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-07-11 20:06:08.0 +0200 @@ -1,0 +2,6 @@ +Wed Jul 2 12:42:22 UTC 2014 - kgronl...@suse.com + +- Low: hb_report: combine-logs.pl is obsolete +- upstream: 2.1.0-6-g52f6af222dcb + +--- Other differences: -- ++ crmsh.spec ++ --- /var/tmp/diff_new_pack.zigjEq/_old 2014-07-11 20:06:09.0 +0200 +++ /var/tmp/diff_new_pack.zigjEq/_new 2014-07-11 20:06:09.0 +0200 @@ -41,7 +41,7 @@ Summary:High Availability cluster command-line interface License:GPL-2.0+ Group: %{pkg_group} -Version:2.1+git4 +Version:2.1+git6 Release:%{?crmsh_release}%{?dist} Url:http://crmsh.github.io Source0:crmsh.tar.bz2 ++ crmsh.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/hb_report/Makefile.am new/crmsh/hb_report/Makefile.am --- old/crmsh/hb_report/Makefile.am 2014-06-30 12:58:11.0 +0200 +++ new/crmsh/hb_report/Makefile.am 2014-07-02 12:51:37.0 +0200 @@ -20,6 +20,6 @@ MAINTAINERCLEANFILES = Makefile.in hanoarchdir = $(datadir)/@PACKAGE@ hanoarch_DATA = utillib.sh ha_cf_support.sh openais_conf_support.sh -hanoarch_SCRIPTS = combine-logs.pl hb_report +hanoarch_SCRIPTS = hb_report EXTRA_DIST= $(hanoarch_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/hb_report/combine-logs.pl new/crmsh/hb_report/combine-logs.pl --- old/crmsh/hb_report/combine-logs.pl 2014-06-30 12:58:11.0 +0200 +++ new/crmsh/hb_report/combine-logs.pl 1970-01-01 01:00:00.0 +0100 @@ -1,136 +0,0 @@ -#!/usr/bin/perl -# -# combine-logs v1.0 -# -# Copyright (c) 1999 Steven J. Madsen. All rights reserved. -# -# Combines multiple syslog-format logs into a single chronological log. Very -# handy for syslog report generators such as cksyslog. -# -# usage: combine-logs log file [...] -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Note by Dejan Muhamedagic de...@suse.de -# -# This program was downloaded from -# http://www.moonglade.com/syslog/combine-logs-1.0.tar.gz -# - -$debugging = 0; - -# Open all of the logs. -$handle = fh00; -foreach $file (@ARGV) -{ -$handle++; -open $handle, $file || die Could not open $file: $!\n; -push @fh, $handle; -} - -# Get the first line from each of the files. -$i = 0; -foreach $handle (@fh) -{ -$current_line[$i++] = get_next_line($handle); -} - -# Process the logs. -while (1) -{ -$first = 0; -for ($i = 1; $i @fh; $i++) -{ - if (first_entry($current_line[$first], $current_line[$i])) - { - $first = $i; - } -} -# Fall out if the entry isn't defined (no more entries to print). -last if !defined($current_line[$first]); - -# Print the entry and get the next line from that log. -print $current_line[$first]; -$current_line[$first] = get_next_line($fh[$first]); -} - -# Gets the next line from the provided file handle. -sub get_next_line() -{ -my($handle) = @_; -my($line); -while ($line = $handle) -{ - print read $line if $debugging; - - # Weed out useless last message repeated messages. - next if $line =~ m/last message repeated \d+ times$/; - - # Fall out if the line passes the above tests. - last; -} -return $line; -} - -# Determines which syslog-style log entry comes first. If $a comes first, -# the function returns 0. If $b comes first, the function returns 1. -sub first_entry() -{ -my($a, $b) = @_; -print
commit primus for openSUSE:Factory
Hello community, here is the log from the commit of package primus for openSUSE:Factory checked in at 2014-07-11 20:06:08 Comparing /work/SRC/openSUSE:Factory/primus (Old) and /work/SRC/openSUSE:Factory/.primus.new (New) Package is primus Changes: --- /work/SRC/openSUSE:Factory/primus/primus.changes2014-07-11 06:45:36.0 +0200 +++ /work/SRC/openSUSE:Factory/.primus.new/primus.changes 2014-07-11 20:06:09.0 +0200 @@ -1,0 +2,6 @@ +Fri Jul 11 09:39:28 UTC 2014 - sch...@linux-m68k.org + +- type-directive.patch: Use % in .type directive since @ is a comment + character on arm + +--- New: type-directive.patch Other differences: -- ++ primus.spec ++ --- /var/tmp/diff_new_pack.m2fKkf/_old 2014-07-11 20:06:10.0 +0200 +++ /var/tmp/diff_new_pack.m2fKkf/_new 2014-07-11 20:06:10.0 +0200 @@ -26,6 +26,8 @@ Source0:%{name}-master.zip Source1:primusrun Source2:baselibs.conf +# PATCH-FIX-UPSTREAM Use % in .type directive since @ is a comment character on arm +Patch0: type-directive.patch BuildRequires: Mesa-libGL-devel BuildRequires: gcc-c++ BuildRequires: libX11-devel @@ -44,6 +46,7 @@ %prep %setup -q -n primus-master +%patch0 -p1 cp -p %{SOURCE1} . %build ++ type-directive.patch ++ Index: primus-master/libglfork.cpp === --- primus-master.orig/libglfork.cpp +++ primus-master/libglfork.cpp @@ -915,7 +915,7 @@ ret name par \ #define DEF_GLX_PROTO(ret, name, par, ...) \ static ret l##name par \ { return primus.afns.name(__VA_ARGS__); } \ -asm(.type #name , @gnu_indirect_function); \ +asm(.type #name , %gnu_indirect_function); \ void *ifunc_##name(void) asm(#name) __attribute__((visibility(default))); \ void *ifunc_##name(void) \ { return primus.afns.handle ? real_dlsym(primus.afns.handle, #name) : (void*)l##name; } @@ -1006,7 +1006,7 @@ const char *glXQueryExtensionsString(Dis // OpenGL extension forwarders #define P(name) \ -asm(.type #name , @gnu_indirect_function); \ +asm(.type #name , %gnu_indirect_function); \ void *ifunc_##name(void) asm(#name) __attribute__((visibility(default))); \ void *ifunc_##name(void) \ { return primus.afns.handle ? real_dlsym(primus.afns.handle, #name) : NULL; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org