September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-sexp_processor for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-sexp_processor for openSUSE:Factory checked in at 2014-09-12 11:28:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-sexp_processor (Old) and /work/SRC/openSUSE:Factory/.rubygem-sexp_processor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-sexp_processor" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-sexp_processor/rubygem-sexp_processor.changes 2014-04-08 12:50:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-sexp_processor.new/rubygem-sexp_processor.changes 2014-09-12 12:22:52.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 10 13:58:31 UTC 2014 - mrueckert(a)suse.de + +- added gem2rpm.yml as source + +------------------------------------------------------------------- +Wed Sep 10 09:48:40 UTC 2014 - mrueckert(a)suse.de + +- added a small scriptlet to fix the shebang line of the test + scripts. +- also added a gem2rpm.yml for later, but did not regenerate the + specfile just yet. + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-sexp_processor.spec ++++++ --- /var/tmp/diff_new_pack.Rk5rIW/_old 2014-09-12 12:22:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Rk5rIW/_new 2014-09-12 12:22:53.000000000 +0200 @@ -27,6 +27,7 @@ BuildRequires: rubygem(rdoc) > 3.10 Url: https://github.com/seattlerb/sexp_processor Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml Summary: sexp_processor branches from ParseTree bringing all the generic sexp License: MIT Group: Development/Languages/Ruby @@ -65,6 +66,9 @@ mkdir -p %{buildroot}%{_docdir}/%{name} ln -s %{gem_base}/gems/%{mod_full_name}/History.txt %buildroot/%{_docdir}/%{name}/History.txt ln -s %{gem_base}/gems/%{mod_full_name}/README.txt %buildroot/%{_docdir}/%{name}/README.txt +# MANUAL +perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/test/* +# /MANUAL %files %defattr(-,root,root,-) ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :post_install: |- perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/test/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-ruby_parser for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-ruby_parser for openSUSE:Factory checked in at 2014-09-12 11:28:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ruby_parser (Old) and /work/SRC/openSUSE:Factory/.rubygem-ruby_parser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ruby_parser" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-ruby_parser/rubygem-ruby_parser.changes 2014-05-22 06:57:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-ruby_parser.new/rubygem-ruby_parser.changes 2014-09-12 12:22:51.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 10 13:57:52 UTC 2014 - mrueckert(a)suse.de + +- added gem2rpm.yml as source + +------------------------------------------------------------------- +Wed Sep 10 09:39:32 UTC 2014 - mrueckert(a)suse.de + +- added a small scriptlet to fix the shebang line of the test + scripts +- also added a gem2rpm.yml for later, but did not regenerate the + specfile just yet. + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ruby_parser.spec ++++++ --- /var/tmp/diff_new_pack.x6jxYM/_old 2014-09-12 12:22:52.000000000 +0200 +++ /var/tmp/diff_new_pack.x6jxYM/_new 2014-09-12 12:22:52.000000000 +0200 @@ -30,6 +30,7 @@ BuildRequires: rubygem(rdoc) > 3.10 Url: https://github.com/seattlerb/ruby_parser Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml Summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing License: MIT Group: Development/Languages/Ruby @@ -96,6 +97,10 @@ ln -s %{gem_base}/gems/%{mod_full_name}/History.txt %buildroot/%{_docdir}/%{name}/History.txt ln -s %{gem_base}/gems/%{mod_full_name}/README.txt %buildroot/%{_docdir}/%{name}/README.txt +# MANUAL +perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/test/* +# /MANUAL + %post /usr/sbin/update-alternatives --install \ %{_bindir}/ruby_parse ruby_parse %{_bindir}/ruby_parse%{mod_branch} %{mod_weight} ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :post_install: |- perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/test/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-flog for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-flog for openSUSE:Factory checked in at 2014-09-12 11:28:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-flog (Old) and /work/SRC/openSUSE:Factory/.rubygem-flog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-flog" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-flog/rubygem-flog.changes 2013-10-31 15:55:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-flog.new/rubygem-flog.changes 2014-09-12 12:22:49.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Sep 10 13:59:44 UTC 2014 - mrueckert(a)suse.de + +- added gem2rpm.yml as source + +------------------------------------------------------------------- +Wed Sep 10 09:32:05 UTC 2014 - mrueckert(a)suse.de + +- added a small scriptlet to fix the shebang line of the wrapper + script in the gem dir. the installed copy has it overwritten + but our she bang line checks the not installed copy too. +- also added a gem2rpm.yml for later, but did not regenerate the + specfile just yet. + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-flog.spec ++++++ --- /var/tmp/diff_new_pack.xpOuNf/_old 2014-09-12 12:22:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xpOuNf/_new 2014-09-12 12:22:50.000000000 +0200 @@ -30,6 +30,7 @@ BuildRequires: rubygem(rdoc) > 3.10 Url: http://ruby.sadi.st/ Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml Summary: Flog reports the most tortured code in an easy to read pain report License: MIT Group: Development/Languages/Ruby @@ -73,6 +74,9 @@ mkdir -p %{buildroot}%{_docdir}/%{name} ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/History.txt %buildroot/%{_docdir}/%{name}/History.txt ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/README.txt %buildroot/%{_docdir}/%{name}/README.txt +# MANUAL +perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/bin/flog +# /MANUAL %post /usr/sbin/update-alternatives --install \ ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :post_install: |- perl -p -i -e 's|#!\S+|#!/usr/bin/ruby|g' %{buildroot}%{_libdir}/*/gems/*/gems/%{mod_full_name}/bin/flog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-nokogiri for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-nokogiri for openSUSE:Factory checked in at 2014-09-12 11:28:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-nokogiri (Old) and /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-nokogiri" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-nokogiri/rubygem-nokogiri.changes 2014-06-01 18:54:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new/rubygem-nokogiri.changes 2014-09-12 11:28:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 10 09:59:44 UTC 2014 - mrueckert(a)suse.de + +- remove unneded rm call, this is handled in gem_cleanup.sh now. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-nokogiri.spec ++++++ --- /var/tmp/diff_new_pack.7vRIBj/_old 2014-09-12 11:28:24.000000000 +0200 +++ /var/tmp/diff_new_pack.7vRIBj/_new 2014-09-12 11:28:24.000000000 +0200 @@ -37,6 +37,7 @@ # MANUAL END Url: http://nokogiri.org Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: rubygem-nokogiri-rpmlintrc Summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser License: MIT Group: Development/Languages/Ruby @@ -79,7 +80,6 @@ %gem_cleanup # MANUAL rm -rf %{buildroot}%{gem_base}/gems/%{mod_full_name}/ports -rm %{buildroot}%{gem_base}/doc/extensions/*/*/%{mod_full_name}/page-mkmf_log.ri mkdir -p %{buildroot}%{_sysconfdir}/alternatives mv %{buildroot}%{_bindir}/nokogiri{,%{mod_branch}} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-gem2rpm for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package rubygem-gem2rpm for openSUSE:Factory checked in at 2014-09-12 11:28:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-gem2rpm (Old) and /work/SRC/openSUSE:Factory/.rubygem-gem2rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-gem2rpm" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-gem2rpm/rubygem-gem2rpm.changes 2014-07-27 18:47:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-gem2rpm.new/rubygem-gem2rpm.changes 2014-09-12 11:28:22.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Sep 8 11:02:50 UTC 2014 - mrueckert(a)suse.de + +- changed rubinius macro + +------------------------------------------------------------------- +Fri Sep 5 09:46:22 UTC 2014 - mrueckert(a)suse.de + +- for easier bootstrapping dont use gem2rpm here for now. + +------------------------------------------------------------------- +Thu Sep 4 13:34:30 UTC 2014 - mrueckert(a)suse.de + +- make it easier to enable rbx and ruby 2.2 support + +------------------------------------------------------------------- +Wed Sep 3 12:44:54 UTC 2014 - mrueckert(a)suse.de + +- added support for building for rbx + +------------------------------------------------------------------- +Mon Jul 28 11:11:27 UTC 2014 - mrueckert(a)suse.de + +- really install the templates as docs + +------------------------------------------------------------------- @@ -49,0 +75,3 @@ +- added gem2rpm_bootstrap conditional: + If this is set to true, the hardcoded subpackage/files sections + are used. Otherwise it will use the normal gem2rpm based solution @@ -58,0 +87 @@ +- only build for 2.1 for now @@ -127,0 +157,35 @@ +- added quilt series file to the sources list +- dropped empty doc package + +------------------------------------------------------------------- +Thu Jun 26 09:58:34 UTC 2014 - mrueckert(a)suse.de + +- update rpm macros requires to 5 + +------------------------------------------------------------------- +Wed Jun 25 17:07:59 UTC 2014 - mrueckert(a)suse.de + +- fix filelist for multi ruby packaging + +------------------------------------------------------------------- +Wed Jun 25 16:28:46 UTC 2014 - mrueckert(a)suse.de + +- add ruby 2.2 support + +------------------------------------------------------------------- +Tue Jun 24 15:19:28 UTC 2014 - mrueckert(a)suse.de + +- added BuildIgnore for rubygem(gem2rpm), otherwise we can not + bootstrap a new ruby version. this package will need the + subpackages for a new ruby version to be created manually. + +------------------------------------------------------------------- +Wed Jun 18 20:10:04 UTC 2014 - mrueckert(a)suse.de + +- fixed paths in the u-a scriptlets + +------------------------------------------------------------------- +Wed Jun 18 18:47:31 UTC 2014 - mrueckert(a)suse.de + +- no longer provide gem2rpm-opensuse +- use new style packaging but the hardcoded version @@ -140,0 +205 @@ + New: ---- series ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-gem2rpm.spec ++++++ --- /var/tmp/diff_new_pack.tpng0C/_old 2014-09-12 11:28:23.000000000 +0200 +++ /var/tmp/diff_new_pack.tpng0C/_new 2014-09-12 11:28:23.000000000 +0200 @@ -14,7 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%bcond_without gem2rpm_bootstrap +%bcond_with ruby22 +%bcond_with rubinius22 Name: rubygem-gem2rpm Version: 0.10.1 @@ -23,16 +25,21 @@ %define mod_full_name %{mod_name}-%{version} %define mod_branch -%{version} %define mod_weight 1001 -# +#define rb_build_versions %{rb_default_ruby} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ruby-macros >= 1 -%rubygems_requires +BuildRequires: ruby-macros >= 5 +BuildRequires: %{ruby} +%if %{with gem2rpm_bootstrap} +#!BuildIgnore: rubygem(gem2rpm) rubygem(ruby:2.1.0:gem2rpm) rubygem(ruby:2.2.0:gem2rpm) rubygem(rbx:2.2:gem2rpm) +%else +BuildRequires: %{rubygem gem2rpm} +%endif +BuildRequires: update-alternatives Url: https://github.com/lutter/gem2rpm/ Source: http://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml.documentation Source2: gem2rpm-opensuse - - +Source3: series Patch0: 0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch Patch1: 0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch Patch2: 0003-sle-12-templates.-they-require-the-config-file-suppo.patch @@ -49,15 +56,6 @@ Generate source rpms and rpm spec files from a Ruby Gem. The spec file tries to follow the gem as closely as possible -%package doc -Summary: RDoc documentation for %{mod_name} -Group: Development/Languages/Ruby -Requires: %{name} = %{version} - -%description doc -Documentation generated at gem installation time. -Usually in RDoc and RI formats. - %prep %gem_unpack %patch0 -p1 @@ -72,35 +70,183 @@ %gem_build %install -%gem_install -f -%{__install} -D -m 0755 %{S:2} %{buildroot}%{_bindir}/gem2rpm-opensuse -mv %{buildroot}%{_bindir}/gem2rpm{,%{mod_branch}} -ln -s gem2rpm%{mod_branch} %{buildroot}%{_bindir}/gem2rpm -cp %{S:1} gem2rpm.yml -install -m 0644 %{mod_full_name}/templates/sles12*.spec.erb \ - %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/templates/ +%gem_install -f --symlink-binaries --doc-files="AUTHORS LICENSE README" +for i in %{buildroot}%{_docdir}/*rubygem-gem2rpm*/ ; do + install -m 0644 %{S:1} $i/gem2rpm.yml + install -m 0644 %{mod_full_name}/templates/sles12*.spec.erb $i/ +done + +%if %{with gem2rpm_bootstrap} +%package -n ruby2.1-rubygem-gem2rpm +Summary: Generate rpm specfiles from gems +Group: Development/Languages/Ruby +PreReq: update-alternatives + +%description -n ruby2.1-rubygem-gem2rpm +Generate source rpms and rpm spec files from a Ruby Gem. +The spec file tries to follow the gem as closely as possible + +%package -n ruby2.1-rubygem-gem2rpm-doc +Summary: RDoc documentation for %{mod_name} +Group: Development/Languages/Ruby +Requires: ruby2.1-rubygem-gem2rpm = %{version} + +%description -n ruby2.1-rubygem-gem2rpm-doc +Documentation generated at gem installation time. +Usually in RDoc and RI formats. + + +%post -n ruby2.1-rubygem-gem2rpm +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm gem2rpm %{_bindir}/gem2rpm.ruby2.1-%{version} %{mod_weight} +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm-%{version} gem2rpm-%{version} %{_bindir}/gem2rpm.ruby2.1-%{version} %{mod_weight} +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm.ruby2.1 gem2rpm.ruby2.1 %{_bindir}/gem2rpm.ruby2.1-%{version} %{mod_weight} + +%preun -n ruby2.1-rubygem-gem2rpm +if [ "$1" = 0 ] ; then + /usr/sbin/update-alternatives --remove gem2rpm %{_bindir}/gem2rpm.ruby2.1-%{version} + /usr/sbin/update-alternatives --remove gem2rpm-%{version} %{_bindir}/gem2rpm.ruby2.1-%{version} + /usr/sbin/update-alternatives --remove gem2rpm.ruby2.1 %{_bindir}/gem2rpm.ruby2.1-%{version} +fi + +%files -n ruby2.1-rubygem-gem2rpm +%defattr(-,root,root,-) +%{_docdir}/ruby2.1-rubygem-gem2rpm +#{_bindir}/gem2rpm-opensuse +%{_bindir}/gem2rpm.ruby2.1-%{version} +%ghost %{_bindir}/gem2rpm.ruby2.1 +%ghost %{_bindir}/gem2rpm-%{version} +%ghost %{_bindir}/gem2rpm +%ghost %{_sysconfdir}/alternatives/gem2rpm +%ghost %{_sysconfdir}/alternatives/gem2rpm.ruby2.1 +%ghost %{_sysconfdir}/alternatives/gem2rpm-%{version} +# cache file +%{_libdir}/ruby/gems/2.1.0/cache/gem2rpm-%{version}.gem +%{_libdir}/ruby/gems/2.1.0/gems/gem2rpm-%{version} +%{_libdir}/ruby/gems/2.1.0/specifications/gem2rpm-%{version}.gemspec + +%files -n ruby2.1-rubygem-gem2rpm-doc +%defattr(-,root,root,-) +%doc %{_libdir}/ruby/gems/2.1.0/doc/gem2rpm-%{version} + +%if %{with ruby22} +%package -n ruby2.2-rubygem-gem2rpm +Summary: Generate rpm specfiles from gems +Group: Development/Languages/Ruby +PreReq: update-alternatives + +%description -n ruby2.2-rubygem-gem2rpm +Generate source rpms and rpm spec files from a Ruby Gem. +The spec file tries to follow the gem as closely as possible + +%package -n ruby2.2-rubygem-gem2rpm-doc +Summary: RDoc documentation for %{mod_name} +Group: Development/Languages/Ruby +Requires: ruby2.2-rubygem-gem2rpm = %{version} + +%description -n ruby2.2-rubygem-gem2rpm-doc +Documentation generated at gem installation time. +Usually in RDoc and RI formats. + + +%post -n ruby2.2-rubygem-gem2rpm +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm gem2rpm %{_bindir}/gem2rpm.ruby2.2-%{version} %{mod_weight} +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm-%{version} gem2rpm-%{version} %{_bindir}/gem2rpm.ruby2.2-%{version} %{mod_weight} +/usr/sbin/update-alternatives --install \ + %{_bindir}/gem2rpm.ruby2.2 gem2rpm.ruby2.2 %{_bindir}/gem2rpm.ruby2.2-%{version} %{mod_weight} + +%preun -n ruby2.2-rubygem-gem2rpm +if [ "$1" = 0 ] ; then + /usr/sbin/update-alternatives --remove gem2rpm %{_bindir}/gem2rpm.ruby2.2-%{version} + /usr/sbin/update-alternatives --remove gem2rpm-%{version} %{_bindir}/gem2rpm.ruby2.2-%{version} + /usr/sbin/update-alternatives --remove gem2rpm.ruby2.2 %{_bindir}/gem2rpm.ruby2.2-%{version} +fi -%post +%files -n ruby2.2-rubygem-gem2rpm +%defattr(-,root,root,-) +%{_docdir}/ruby2.2-rubygem-gem2rpm +#{_bindir}/gem2rpm-opensuse +%{_bindir}/gem2rpm.ruby2.2-%{version} +%ghost %{_bindir}/gem2rpm.ruby2.2 +%ghost %{_bindir}/gem2rpm-%{version} +%ghost %{_bindir}/gem2rpm +%ghost %{_sysconfdir}/alternatives/gem2rpm +%ghost %{_sysconfdir}/alternatives/gem2rpm.ruby2.2 +%ghost %{_sysconfdir}/alternatives/gem2rpm-%{version} +# cache file +%{_libdir}/ruby/gems/2.2.0/cache/gem2rpm-%{version}.gem +%{_libdir}/ruby/gems/2.2.0/gems/gem2rpm-%{version} +%{_libdir}/ruby/gems/2.2.0/specifications/gem2rpm-%{version}.gemspec + +%files -n ruby2.2-rubygem-gem2rpm-doc +%defattr(-,root,root,-) +%doc %{_libdir}/ruby/gems/2.2.0/doc/gem2rpm-%{version} +%endif + +%if %{with rubinius22} +%package -n rbx2.2-rubygem-gem2rpm +# MANUAL +# /MANUAL +Summary: Generate rpm specfiles from gems +Group: Development/Languages/Ruby +PreReq: update-alternatives + +%description -n rbx2.2-rubygem-gem2rpm +Generate source rpms and rpm spec files from a Ruby Gem. +The spec file tries to follow the gem as closely as possible. + +%package -n rbx2.2-rubygem-gem2rpm-doc +Summary: RDoc documentation for gem2rpm +Group: Development/Languages/Ruby +Requires: rbx2.2-rubygem-gem2rpm = %{version} + +%description -n rbx2.2-rubygem-gem2rpm-doc +Documentation generated at gem installation time. +Usually in RDoc and RI formats. + + +%post -n rbx2.2-rubygem-gem2rpm +/usr/sbin/update-alternatives --install \ + /usr/bin/gem2rpm gem2rpm /usr/bin/gem2rpm.rbx2.2-%{version} %{mod_weight} +/usr/sbin/update-alternatives --install \ + /usr/bin/gem2rpm-%{version} gem2rpm-%{version} /usr/bin/gem2rpm.rbx2.2-%{version} %{mod_weight} /usr/sbin/update-alternatives --install \ - %{_bindir}/gem2rpm gem2rpm %{_bindir}/gem2rpm%{mod_branch} %{mod_weight} + /usr/bin/gem2rpm.rbx2.2 gem2rpm.rbx2.2 /usr/bin/gem2rpm.rbx2.2-%{version} %{mod_weight} -%preun +%preun -n rbx2.2-rubygem-gem2rpm if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove gem2rpm %{_bindir}/gem2rpm%{mod_branch} + /usr/sbin/update-alternatives --remove gem2rpm /usr/bin/gem2rpm.rbx2.2-%{version} + /usr/sbin/update-alternatives --remove gem2rpm-%{version} /usr/bin/gem2rpm.rbx2.2-%{version} + /usr/sbin/update-alternatives --remove gem2rpm.rbx2.2 /usr/bin/gem2rpm.rbx2.2-%{version} fi -%files +%files -n rbx2.2-rubygem-gem2rpm %defattr(-,root,root,-) -%doc gem2rpm.yml %{mod_full_name}/templates/sles12*.spec.erb -%{_bindir}/gem2rpm%{mod_branch} +# MANUAL +# /MANUAL +/usr/share/doc/packages/rbx2.2-rubygem-gem2rpm +%{_bindir}/gem2rpm.rbx2.2-%{version} +%ghost %{_bindir}/gem2rpm.rbx2.2 +%ghost %{_bindir}/gem2rpm-%{version} %ghost %{_bindir}/gem2rpm -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec -%{_bindir}/gem2rpm-opensuse +%ghost /etc/alternatives/gem2rpm +%ghost /etc/alternatives/gem2rpm.rbx2.2 +%ghost /etc/alternatives/gem2rpm-%{version} +# cache file +%{_libdir}/rubinius/gems/2.2/cache/gem2rpm-%{version}.gem +%{_libdir}/rubinius/gems/2.2/gems/gem2rpm-%{version} +%{_libdir}/rubinius/gems/2.2/specifications/gem2rpm-%{version}.gemspec -%files doc +%files -n rbx2.2-rubygem-gem2rpm-doc %defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ +%doc %{_libdir}/rubinius/gems/2.2/doc/gem2rpm-%{version} +%endif +%else +%gem_packages +%endif %changelog ++++++ series ++++++ 0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch -p1 0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch -p1 0003-sle-12-templates.-they-require-the-config-file-suppo.patch -p1 0004-openSUSE-template-fixes.patch -p1 0005-added-example-gem2rpm.yml.patch -p1 0006-properly-shorten-description-and-summary.patch -p1 0007-Preserve-the-license-header-found-in-the-output-file.patch -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libguestfs for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2014-09-12 11:19:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2014-09-03 20:15:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2014-09-12 11:19:26.000000000 +0200 @@ -2 +2,10 @@ -Tue Aug 26 07:20:34 UTC 2014 - ohering(a)suse.com +Fri Sep 5 09:53:22 CEST 2014 - ohering(a)suse.de + +- Update to version 1.26.9 + * customize: fix locking accounts with passwords + * daemon: lvm-filter: use augeas for setting the filter + * daemon: move AUGEAS_ERROR to the common header + * daemon: add add_sprintf + +------------------------------------------------------------------- +Tue Aug 26 07:20:34 UTC 2014 - ohering(a)suse.de Old: ---- libguestfs-1.26.8.tar.xz New: ---- libguestfs-1.26.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.STD2NN/_old 2014-09-12 11:19:27.000000000 +0200 +++ /var/tmp/diff_new_pack.STD2NN/_new 2014-09-12 11:19:27.000000000 +0200 @@ -17,7 +17,7 @@ # -Version: 1.26.8 +Version: 1.26.9 Release: 0 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) ++++++ libguestfs-1.26.8.tar.xz -> libguestfs-1.26.9.tar.xz ++++++ ++++ 6041 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 mxml for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package mxml for openSUSE:Factory checked in at 2014-09-12 11:19:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mxml (Old) and /work/SRC/openSUSE:Factory/.mxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mxml" Changes: -------- --- /work/SRC/openSUSE:Factory/mxml/mxml.changes 2012-02-16 10:06:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mxml.new/mxml.changes 2014-09-12 11:19:24.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 19:02:58 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mxml.spec ++++++ --- /var/tmp/diff_new_pack.XR46TH/_old 2014-09-12 11:19:25.000000000 +0200 +++ /var/tmp/diff_new_pack.XR46TH/_new 2014-09-12 11:19:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mxml # -# 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 @@ -16,15 +16,15 @@ # - Name: mxml Url: http://www.easysw.com/~mike/mxml -License: LGPL-2.1+ -Group: Development/Libraries/Other Version: 2.6 -Release: 25 +Release: 0 Summary: Small XML Parsing Library +License: LGPL-2.1+ +Group: Development/Libraries/Other Source: %{name}-%{version}.tar.bz2 +Source1: baselibs.conf Patch: mxml-2.3-nobinstrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig @@ -45,9 +45,10 @@ %define library_name libmxml1 %package -n %library_name -Group: Development/Libraries/Other # Summary: Shared library for mxml +License: LGPL-2.1+ +Group: Development/Libraries/Other %description -n %library_name Mini-XML is a small XML parsing library that you can use to read XML @@ -63,11 +64,11 @@ Michael Sweet %package devel -License: GPL-2.0+ -Group: Development/Libraries/Other Requires: %{library_name} = %{version} # Summary: Development files for mxml +License: GPL-2.0+ +Group: Development/Libraries/Other %description devel Mini-XML is a small XML parsing library that you can use to read XML ++++++ baselibs.conf ++++++ libmxml1-- 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 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2014-09-12 11:19:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-27 07:46:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2014-09-12 11:19:22.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Sep 12 07:03:37 UTC 2014 - adrian(a)suse.de + +- 0.148.1 + - fixes crash regression + +------------------------------------------------------------------- +Thu Sep 11 10:35:57 UTC 2014 - adrian(a)suse.de + +- 0.148.0 + - support new history including review history of OBS 2.6 + - display request priorities, if important or critical + - add "osc rq priorize" command to re-priorize existing requests + - allow also "osc rq ls" shortcut + - fish shell completion support + +------------------------------------------------------------------- @@ -4 +20 @@ -- 0.147 +- 0.147.0 Old: ---- osc-0.147.0.tar.gz New: ---- osc-0.148.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: osc -Version: 0.147.0 +Version: 0.148.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:23.000000000 +0200 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.147.0 +pkgver=0.148.1 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ groups=('base-devel') depends=('python2' 'python2-m2crypto' 'urlgrabber') source=(osc-${pkgver}.tar.gz) -md5sums=('a0a5d3abb52b62ea616c8a209a336096') +md5sums=('afe87fa0c93848a0492da4505d56725b') package() { msg "Installing osc ..." ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:23.000000000 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.147.0</param> - <param name="revision">0.147.0</param> + <param name="version">0.148.1</param> + <param name="revision">0.148</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ osc-0.147.0.tar.gz -> osc-0.148.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/NEWS new/osc-0.148.1/NEWS --- old/osc-0.147.0/NEWS 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/NEWS 2014-09-12 09:13:58.000000000 +0200 @@ -1,3 +1,10 @@ +0.148 + - support new history including review history of OBS 2.6 + - display request priorities, if important or critical + - add "osc rq priorize" command to re-priorize existing requests + - allow also "osc rq ls" shortcut + - fish shell completion support + 0.147 - support groups in maintainership requests - fixing listing of review requests @@ -8,6 +15,7 @@ - handle ppc64le for debian as well - fix buildlog --strip-time - some more minor bugfixes + - speedup update of a project working copy (in some cases) 0.146 - support maintenance release request with acceptinfo data (OBS 2.6) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc/build.py new/osc-0.148.1/osc/build.py --- old/osc-0.147.0/osc/build.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/osc/build.py 2014-09-12 09:13:58.000000000 +0200 @@ -268,6 +268,7 @@ b_built = subprocess.Popen(['find', os.path.join(pacdir, 'KIWI'), '-type', 'f'], stdout=subprocess.PIPE).stdout.read().strip() + s_built = '' elif buildtype == 'dsc': b_built = subprocess.Popen(['find', os.path.join(pacdir, 'DEBS'), '-name', '*.deb'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc/commandline.py new/osc-0.148.1/osc/commandline.py --- old/osc-0.147.0/osc/commandline.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/osc/commandline.py 2014-09-12 09:13:58.000000000 +0200 @@ -1958,6 +1958,9 @@ "checkout" will checkout the request's source package ("submit" requests only). + "priorize" change the prioritity of a request to either "critical", "important", "moderate" or "low" + + The 'review' command has the following sub commands: "list" lists open requests that need to be reviewed by the @@ -1982,6 +1985,7 @@ osc request setincident [-m TEXT] ID INCIDENT osc request supersede [-m TEXT] ID SUPERSEDING_ID osc request approvenew [-m TEXT] PROJECT + osc request priorize [-m TEXT] ID PRIORITY osc request checkout/co ID osc request clone [-m TEXT] ID @@ -2021,7 +2025,7 @@ if args[0] == 'help': return self.do_help(['help', 'request']) - cmds = ['list', 'log', 'show', 'decline', 'reopen', 'clone', 'accept', 'approvenew', 'wipe', 'setincident', 'supersede', 'revoke', 'checkout', 'co'] + cmds = ['list', 'ls', 'log', 'show', 'decline', 'reopen', 'clone', 'accept', 'approvenew', 'wipe', 'setincident', 'supersede', 'revoke', 'checkout', 'co', 'priorize'] if subcmd != 'review' and args[0] not in cmds: raise oscerr.WrongArgs('Unknown request action %s. Choose one of %s.' \ % (args[0], ', '.join(cmds))) @@ -2032,12 +2036,14 @@ cmd = args[0] del args[0] + if cmd == 'ls': + cmd = "list" apiurl = self.get_api_url() if cmd in ['list']: min_args, max_args = 0, 2 - elif cmd in ['supersede', 'setincident']: + elif cmd in ['supersede', 'setincident', 'priorize']: min_args, max_args = 2, 2 else: min_args, max_args = 1, 1 @@ -2074,6 +2080,9 @@ elif cmd == 'setincident': reqid = args[0] incident = args[1] + elif cmd == 'priorize': + reqid = args[0] + priority = args[1] elif cmd in ['log', 'add', 'show', 'decline', 'reopen', 'clone', 'accept', 'wipe', 'revoke', 'checkout', 'co']: reqid = args[0] @@ -2088,6 +2097,13 @@ url = makeurl(apiurl, ['request', reqid], query) r = http_POST(url, data=opts.message) print(ET.parse(r).getroot().get('code')) + + # change priority + elif cmd == 'priorize': + query = { 'cmd': 'setpriority', 'priority': priority } + url = makeurl(apiurl, ['request', reqid], query) + r = http_POST(url, data=opts.message) + print(ET.parse(r).getroot().get('code')) # add new reviewer to existing request elif cmd in ['add'] and subcmd == 'review': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc/core.py new/osc-0.148.1/osc/core.py --- old/osc-0.147.0/osc/core.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/osc/core.py 2014-09-12 09:13:58.000000000 +0200 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.147' +__version__ = '0.148' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -2357,6 +2357,10 @@ """return data from <comment /> tag""" raise NotImplementedError() + def get_description(self): + """return data from <description /> tag""" + raise NotImplementedError() + def to_xml(self): """serialize object to XML""" root = ET.Element(self.get_node_name()) @@ -2364,6 +2368,8 @@ val = getattr(self, attr) if not val is None: root.set(attr, val) + if self.get_description(): + ET.SubElement(root, 'description').text = self.get_description() if self.get_comment(): ET.SubElement(root, 'comment').text = self.get_comment() return root @@ -2400,6 +2406,37 @@ def get_comment(self): return self.comment + def get_description(self): + return None + + +class RequestHistory(AbstractState): + """Represents a history element of a request""" + def __init__(self, history_node): + AbstractState.__init__(self, history_node.tag) + self.who = history_node.get('who') + self.when = history_node.get('when') + if not history_node.find('description') is None and \ + history_node.find('description').text: + # OBS 2.6 + self.description = history_node.find('description').text.strip() + else: + # OBS 2.5 and before + self.description = history_node.get('name') + self.comment = '' + if not history_node.find('comment') is None and \ + history_node.find('comment').text: + self.comment = history_node.find('comment').text.strip() + + def get_node_attrs(self): + return ('who', 'when') + + def get_description(self): + return self.description + + def get_comment(self): + return self.comment + class RequestState(AbstractState): """Represents the state of a request""" @@ -2411,6 +2448,9 @@ self.name = state_node.get('name') self.who = state_node.get('who') self.when = state_node.get('when') + if state_node.find('description') is None: + # OBS 2.6 has it always, before it did not exist + self.description = state_node.get('description') self.comment = '' if not state_node.find('comment') is None and \ state_node.find('comment').text: @@ -2422,6 +2462,9 @@ def get_comment(self): return self.comment + def get_description(self): + return None + class Action: """ @@ -2553,6 +2596,7 @@ self.reqid = None self.title = '' self.description = '' + self.priority = None self.state = None self.accept_at = None self.actions = [] @@ -2578,8 +2622,10 @@ self.actions.append(Action.from_xml(action)) for review in root.findall('review'): self.reviews.append(ReviewState(review)) - for hist_state in root.findall('history'): - self.statehistory.append(RequestState(hist_state)) + for history_element in root.findall('history'): + self.statehistory.append(RequestHistory(history_element)) + if not root.find('priority') is None and root.find('priority').text: + self.priority = root.find('priority').text.strip() if not root.find('accept_at') is None and root.find('accept_at').text: self.accept_at = root.find('accept_at').text.strip() if not root.find('title') is None: @@ -2625,6 +2671,8 @@ ET.SubElement(root, 'description').text = self.description if self.accept_at: ET.SubElement(root, 'accept_at').text = self.accept_at + if self.priority: + ET.SubElement(root, 'priority').text = self.priority return root def to_str(self): @@ -2751,7 +2799,7 @@ tmpl = ' Review by %(type)-10s is %(state)-10s %(by)-50s' for review in self.reviews: lines.append(tmpl % Request.format_review(review)) - history = ['%s(%s)' % (hist.name, hist.who) for hist in self.statehistory] + history = ['%s: %s' % (hist.description, hist.who) for hist in self.statehistory] if history: lines.append(' From: %s' % ' -> '.join(history)) if self.description: @@ -2766,6 +2814,8 @@ lines = ['Request: #%s\n' % self.reqid] if self.accept_at and self.state.name in [ 'new', 'review' ]: lines.append(' *** This request will get automatically accepted after '+self.accept_at+' ! ***\n') + if self.priority in [ 'critical', 'important' ] and self.state.name in [ 'new', 'review' ]: + lines.append(' *** This request has classified as '+self.priority+' ! ***\n') for action in self.actions: tmpl = ' %(type)-13s %(source)s %(target)s' @@ -2802,11 +2852,10 @@ if reviews: lines.append('\nReview: %s' % indent.join(reviews)) - tmpl = '%(name)-10s %(when)-12s %(who)s' + tmpl = '%(when)-10s %(who)-12s %(desc)s' histories = [] for hist in reversed(self.statehistory): - d = {'name': hist.name, 'when': hist.when, - 'who': hist.who} + d = {'when': hist.when, 'who': hist.who, 'desc': hist.description} histories.append(tmpl % d) if histories: lines.append('\nHistory: %s' % indent.join(histories)) @@ -3921,7 +3970,7 @@ def get_request(apiurl, reqid): - u = makeurl(apiurl, ['request', reqid]) + u = makeurl(apiurl, ['request', reqid], {'withfullhistory': '1'}) f = http_GET(u) root = ET.parse(f).getroot() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/osc.fish new/osc-0.148.1/osc.fish --- old/osc-0.147.0/osc.fish 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.148.1/osc.fish 2014-09-12 09:13:58.000000000 +0200 @@ -0,0 +1,116 @@ +# fish completion for git +# vim: smartindent:expandtab:ts=2:sw=2 + +function __fish_osc_needs_command + set cmd (commandline -opc) + if contains "$cmd" 'osc' 'osc help' + return 0 + end + return 1 +end + +function __fish_osc_using_command + set cmd (commandline -opc) + if [ (count $cmd) -gt 1 ] + for arg in $argv + if [ $arg = $cmd[2] ] + return 0 + end + end + end + return 1 +end + +# general options +complete -f -c osc -n 'not __fish_osc_needs_command' -s A -l apiurl -d 'specify URL to access API server at or an alias' +complete -f -c osc -n 'not __fish_osc_needs_command' -s c -l config -d 'specify alternate configuration file' +complete -f -c osc -n 'not __fish_osc_needs_command' -s d -l debug -d 'print info useful for debugging' +complete -f -c osc -n 'not __fish_osc_needs_command' -l debugger -d 'jump into the debugger before executing anything' +complete -f -c osc -n 'not __fish_osc_needs_command' -s h -l help -d 'show this help message and exit' +complete -f -c osc -n 'not __fish_osc_needs_command' -s H -l http-debug -d 'debug HTTP traffic (filters some headers)' +complete -f -c osc -n 'not __fish_osc_needs_command' -l http-full-debug -d 'debug HTTP traffic (filters no headers)' +complete -f -c osc -n 'not __fish_osc_needs_command' -l no-gnome-keyring -d 'disable usage of GNOME Keyring' +complete -f -c osc -n 'not __fish_osc_needs_command' -l no-keyring -d 'disable usage of desktop keyring system' +complete -f -c osc -n 'not __fish_osc_needs_command' -l post-mortem -d 'jump into the debugger in case of errors' +complete -f -c osc -n 'not __fish_osc_needs_command' -s q -l quiet -d 'be quiet, not verbose' +complete -f -c osc -n 'not __fish_osc_needs_command' -s t -l traceback -d 'print call trace in case of errors' +complete -f -c osc -n 'not __fish_osc_needs_command' -s v -l verbose -d 'increase verbosity' +complete -f -c osc -n 'not __fish_osc_needs_command' -l version -d 'show program\'s version number and exit' + +# osc commands +complete -f -c osc -n '__fish_osc_needs_command' -a 'add' -d 'Mark files to be added upon the next commit' +complete -f -c osc -n '__fish_osc_needs_command' -a 'addremove ar' -d 'Adds new files, removes disappeared files' +complete -f -c osc -n '__fish_osc_needs_command' -a 'aggregatepac' -d '"Aggregate" a package to another package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'api' -d 'Issue an arbitrary request to the API' +complete -f -c osc -n '__fish_osc_needs_command' -a 'branch bco branchco getpac' -d 'Branch a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'chroot' -d 'into the buildchroot' +complete -f -c osc -n '__fish_osc_needs_command' -a 'clean' -d 'removes all untracked files from the package working ...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'commit checkin ci' -d 'Upload content to the repository server' +complete -f -c osc -n '__fish_osc_needs_command' -a 'config' -d 'get/set a config option' +complete -f -c osc -n '__fish_osc_needs_command' -a 'copypac' -d 'Copy a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'createincident' -d 'Create a maintenance incident' +complete -f -c osc -n '__fish_osc_needs_command' -a 'createrequest creq' -d 'create multiple requests with a single command' +complete -f -c osc -n '__fish_osc_needs_command' -a 'delete del remove rm' -d 'Mark files or package directories to be deleted upon ...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'deleterequest deletereq dr dropreq droprequest' -d 'Request to delete (or "drop") a package or project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'dependson whatdependson' -d 'Show the build dependencies' +complete -f -c osc -n '__fish_osc_needs_command' -a 'detachbranch' -d 'replace a link with its expanded sources' +complete -f -c osc -n '__fish_osc_needs_command' -a 'develproject bsdevelproject dp' -d 'print the devel project / package of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'diff di ldiff linkdiff' -d 'Generates a diff' +complete -f -c osc -n '__fish_osc_needs_command' -a 'distributions dists' -d 'Shows all available distributions' +complete -f -c osc -n '__fish_osc_needs_command' -a 'getbinaries' -d 'Download binaries to a local directory' +complete -f -c osc -n '__fish_osc_needs_command' -a 'help ? h' -d 'give detailed help on a specific sub-command' +complete -f -c osc -n '__fish_osc_needs_command' -a 'importsrcpkg' -d 'Import a new package from a src.rpm' +complete -f -c osc -n '__fish_osc_needs_command' -a 'info' -d 'Print information about a working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'init' -d 'Initialize a directory as working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'jobhistory jobhist' -d 'Shows the job history of a project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'linkpac' -d '"Link" a package to another package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'linktobranch' -d 'Convert a package containing a classic link with patc...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'list LL lL ll ls' -d 'List sources or binaries on the server' +complete -f -c osc -n '__fish_osc_needs_command' -a 'localbuildlog lbl' -d 'Shows the build log of a local buildchroot' +complete -f -c osc -n '__fish_osc_needs_command' -a 'log' -d 'Shows the commit log of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'maintainer bugowner' -d 'Show maintainers according to server side configuration' +complete -f -c osc -n '__fish_osc_needs_command' -a 'maintenancerequest mr' -d 'Create a request for starting a maintenance incident.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'man' -d 'generates a man page' +complete -f -c osc -n '__fish_osc_needs_command' -a 'mbranch maintained sm' -d 'Search or banch multiple instances of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'meta' -d 'Show meta information, or edit it' +complete -f -c osc -n '__fish_osc_needs_command' -a 'mkpac' -d 'Create a new package under version control' +complete -f -c osc -n '__fish_osc_needs_command' -a 'mv' -d 'Move SOURCE file to DEST and keep it under version co...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'my' -d 'show waiting work, packages, projects or requests inv...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'patchinfo' -d 'Generate and edit a patchinfo file.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'pdiff' -d 'Quick alias to diff the content of a package with its...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'prdiff projdiff projectdiff' -d 'Server-side diff of two projects' +complete -f -c osc -n '__fish_osc_needs_command' -a 'prjresults pr' -d 'Shows project-wide build results' +complete -f -c osc -n '__fish_osc_needs_command' -a 'pull' -d 'merge the changes of the link target into your workin...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rdelete' -d 'Delete a project or packages on the server.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rdiff' -d 'Server-side "pretty" diff of two packages' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rebuild rebuildpac' -d 'Trigger package rebuilds' +complete -f -c osc -n '__fish_osc_needs_command' -a 'release' -d 'Release sources and binaries' +complete -f -c osc -n '__fish_osc_needs_command' -a 'releaserequest' -d 'Create a request for releasing a maintenance update.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'remotebuildlog rbl rblt rbuildlog rbuildlogtail remotebuildlogtail' -d 'Shows the build log of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repairlink' -d 'Repair a broken source link' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repairwc' -d 'try to repair an inconsistent working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repositories platforms repos' -d 'shows repositories configured for a project. It skips...' +complete -f -c osc -n '__fish_osc_needs_command' -a 'repourls' -d 'Shows URLs of .repo files' +complete -f -c osc -n '__fish_osc_needs_command' -a 'request review rq' -d 'Show or modify requests and reviews' +complete -f -c osc -n '__fish_osc_needs_command' -a 'requestmaintainership reqbs reqbugownership reqmaintainership reqms requestbugownership' -d 'requests to add user as maintainer or bugowner' +complete -f -c osc -n '__fish_osc_needs_command' -a 'resolved' -d 'Remove "conflicted" state on working copy files' +complete -f -c osc -n '__fish_osc_needs_command' -a 'restartbuild abortbuild' -d 'Restart the build of a certain project or package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'results r' -d 'Shows the build results of a package or project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'revert' -d 'Restore changed files or the entire working copy.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'rremove' -d 'Remove source files from selected package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'search bse se' -d 'Search for a project and/or package.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'service' -d 'Handle source services' +complete -f -c osc -n '__fish_osc_needs_command' -a 'setdevelproject sdp' -d 'Set the devel project / package of a package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'setlinkrev' -d 'Updates a revision number in a source link.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'signkey' -d 'Manage Project Signing Key' +complete -f -c osc -n '__fish_osc_needs_command' -a 'status st' -d 'Show status of files in working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'submitrequest sr submitpac submitreq' -d 'Create request to submit source into another Project' +complete -f -c osc -n '__fish_osc_needs_command' -a 'token' -d 'Show and manage authentication token' +complete -f -c osc -n '__fish_osc_needs_command' -a 'triggerreason tr' -d 'Show reason why a package got triggered to build' +complete -f -c osc -n '__fish_osc_needs_command' -a 'undelete' -d 'Restores a deleted project or package on the server.' +complete -f -c osc -n '__fish_osc_needs_command' -a 'unlock' -d 'Unlocks a project or package' +complete -f -c osc -n '__fish_osc_needs_command' -a 'update up' -d 'Update a working copy' +complete -f -c osc -n '__fish_osc_needs_command' -a 'updatepacmetafromspec metafromspec updatepkgmetafromspec' -d 'Update package meta information from a specfile' +complete -f -c osc -n '__fish_osc_needs_command' -a 'vc' -d 'Edit the changes file' +complete -f -c osc -n '__fish_osc_needs_command' -a 'whois user who' -d 'Show fullname and email of a buildservice user' +complete -f -c osc -n '__fish_osc_needs_command' -a 'wipebinaries' -d 'Delete all binary packages of a certain project/package' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/request_fixtures/test_read_request1.xml new/osc-0.148.1/tests/request_fixtures/test_read_request1.xml --- old/osc-0.147.0/tests/request_fixtures/test_read_request1.xml 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/request_fixtures/test_read_request1.xml 2014-09-12 09:13:58.000000000 +0200 @@ -7,7 +7,8 @@ <target project="deleteme" /> </action> <state name="accepted" when="2010-12-27T01:36:29" who="user1" /> - <history name="new" when="2010-12-13T13:02:03" who="creator"> + <history when="2010-12-13T13:02:03" who="creator"> + <description>Create Request</description> <comment>foobar</comment> </history> <title>title of the request</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/request_fixtures/test_read_request2.xml new/osc-0.148.1/tests/request_fixtures/test_read_request2.xml --- old/osc-0.147.0/tests/request_fixtures/test_read_request2.xml 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/request_fixtures/test_read_request2.xml 2014-09-12 09:13:58.000000000 +0200 @@ -15,5 +15,7 @@ <review by_group="group1" state="new" when="2010-12-28T00:11:22" who="abc"> <comment>review start</comment> </review> - <history name="new" when="2010-12-11T00:00:00" who="creator" /> + <history when="2010-12-11T00:00:00" who="creator"> + <description>Created request</description> + </history> </request> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/request_fixtures/test_request_list_view2.xml new/osc-0.148.1/tests/request_fixtures/test_request_list_view2.xml --- old/osc-0.147.0/tests/request_fixtures/test_request_list_view2.xml 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/request_fixtures/test_request_list_view2.xml 2014-09-12 09:13:58.000000000 +0200 @@ -4,8 +4,12 @@ <person name="buguser" /> </action> <state name="accepted" when="2010-12-29T16:37:45" who="foobar" /> - <history name="new" when="2010-12-28T16:37:45" who="user" /> - <history name="review" when="2010-12-28T18:37:45" who="foobar" /> + <history when="2010-12-28T16:37:45" who="user" > + <description>Created Request</description> + </history> + <history when="2010-12-28T18:37:45" who="foobar" > + <description>Review Approved</description> + </history> <description>This is a simple request with a lot of ... ... text and other stuff. This request also contains a description. This is useful to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.147.0/tests/test_request.py new/osc-0.148.1/tests/test_request.py --- old/osc-0.147.0/tests/test_request.py 2014-08-26 09:51:39.000000000 +0200 +++ new/osc-0.148.1/tests/test_request.py 2014-09-12 09:13:58.000000000 +0200 @@ -342,7 +342,6 @@ self.assertEqual(r.state.when, '2010-12-27T01:36:29') self.assertEqual(r.state.who, 'user1') self.assertEqual(r.state.comment, '') - self.assertEqual(r.statehistory[0].name, 'new') self.assertEqual(r.statehistory[0].when, '2010-12-13T13:02:03') self.assertEqual(r.statehistory[0].who, 'creator') self.assertEqual(r.statehistory[0].comment, 'foobar') @@ -382,7 +381,6 @@ self.assertEqual(r.reviews[0].who, 'abc') self.assertEqual(r.reviews[0].comment, 'review start') self.assertTrue(r.reviews[0].by_user is None) - self.assertEqual(r.statehistory[0].name, 'new') self.assertEqual(r.statehistory[0].when, '2010-12-11T00:00:00') self.assertEqual(r.statehistory[0].who, 'creator') self.assertEqual(r.statehistory[0].comment, '') @@ -455,7 +453,7 @@ exp = """\ 21 State:accepted By:foobar When:2010-12-29T16:37:45 set_bugowner: buguser foo - From: new(user) -> review(foobar) + From: Created Request: user -> Review Approved: foobar Descr: This is a simple request with a lot of ... ... text and other stuff. This request also contains a description. This is useful to describe the request. blabla blabla\n""" @@ -488,8 +486,8 @@ Review: accepted Group: group1 2010-12-29T00:11:22 abc accepted new Group: group1 2010-12-28T00:11:22 abc review start -History: revoked 2010-12-12T00:00:00 creator - new 2010-12-11T00:00:00 creator""" +History: 2010-12-12T00:00:00 creator revoked + 2010-12-11T00:00:00 creator new""" self.assertEqual(exp, str(r)) def test_request_str2(self): ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.EIAhaS/_old 2014-09-12 11:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.EIAhaS/_new 2014-09-12 11:19:24.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.147.0 +Version: 0.148.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 libdmtx for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package libdmtx for openSUSE:Factory checked in at 2014-09-12 11:19:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdmtx (Old) and /work/SRC/openSUSE:Factory/.libdmtx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdmtx" Changes: -------- --- /work/SRC/openSUSE:Factory/libdmtx/libdmtx.changes 2012-11-21 17:02:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdmtx.new/libdmtx.changes 2014-09-12 11:19:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 14:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf, needed for kdebase4-workspace-libs-32bit + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdmtx.spec ++++++ --- /var/tmp/diff_new_pack.ML6EL1/_old 2014-09-12 11:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ML6EL1/_new 2014-09-12 11:19:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdmtx # -# 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 @@ -25,6 +25,7 @@ Url: http://www.libdmtx.org #Source: http://sourceforge.net/projects/libdmtx/files/ Source: %{name}-%{version}.tar.bz2 +Source1: baselibs.conf Patch0: libdmtx-0.7.4.diff BuildRequires: ImageMagick-devel BuildRequires: pkg-config ++++++ baselibs.conf ++++++ libdmtx0-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qrencode for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package qrencode for openSUSE:Factory checked in at 2014-09-12 11:19:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qrencode (Old) and /work/SRC/openSUSE:Factory/.qrencode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qrencode" Changes: -------- --- /work/SRC/openSUSE:Factory/qrencode/qrencode.changes 2013-12-23 22:19:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qrencode.new/qrencode.changes 2014-09-12 11:19:19.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 14:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf, needed for kdebase4-workspace-libs-32bit + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qrencode.spec ++++++ --- /var/tmp/diff_new_pack.k0sH78/_old 2014-09-12 11:19:20.000000000 +0200 +++ /var/tmp/diff_new_pack.k0sH78/_new 2014-09-12 11:19:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qrencode # -# 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 @@ -25,7 +25,8 @@ License: LGPL-2.1+ Group: Productivity/Graphics/Other Url: http://fukuchi.org/works/qrencode/index.en.html -Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 +Source: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 +Source1: baselibs.conf BuildRequires: pkg-config %if !0%{?sles_version} BuildRequires: pkgconfig(libpng) ++++++ baselibs.conf ++++++ libqrencode3-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libprison for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package libprison for openSUSE:Factory checked in at 2014-09-12 11:19:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libprison (Old) and /work/SRC/openSUSE:Factory/.libprison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libprison" Changes: -------- --- /work/SRC/openSUSE:Factory/libprison/libprison.changes 2014-06-25 06:57:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libprison.new/libprison.changes 2014-09-12 11:19:18.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 14:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf, needed for kdebase4-workspace-libs-32bit + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libprison.spec ++++++ --- /var/tmp/diff_new_pack.0Ur9wa/_old 2014-09-12 11:19:19.000000000 +0200 +++ /var/tmp/diff_new_pack.0Ur9wa/_new 2014-09-12 11:19:19.000000000 +0200 @@ -25,6 +25,7 @@ Group: Development/Libraries/C and C++ Url: https://projects.kde.org/projects/prison Source: http://download.kde.org/stable/prison/%{version}/src/%{rname}-%{version}.ta… +Source1: baselibs.conf BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libdmtx-devel ++++++ baselibs.conf ++++++ libprison0-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kactivities4 for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package kactivities4 for openSUSE:Factory checked in at 2014-09-12 11:19:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities4 (Old) and /work/SRC/openSUSE:Factory/.kactivities4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kactivities4" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities4/kactivities4.changes 2014-08-16 15:37:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities4.new/kactivities4.changes 2014-09-12 11:19:17.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 14:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf, needed for kdebase4-workspace-libs-32bit + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities4.spec ++++++ --- /var/tmp/diff_new_pack.EnqIey/_old 2014-09-12 11:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.EnqIey/_new 2014-09-12 11:19:18.000000000 +0200 @@ -24,7 +24,8 @@ License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: kactivities-%{version}.tar.xz +Source: kactivities-%{version}.tar.xz +Source1: baselibs.conf BuildRequires: libkde4-devel >= %version BuildRequires: update-desktop-files BuildRequires: xz ++++++ baselibs.conf ++++++ libkactivities6-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2014-09-12 11:19:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2014-08-25 10:58:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2014-09-12 11:19:16.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 14:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf, needed for kdebase4-workspace-libs-32bit + +------------------------------------------------------------------- @@ -6 +11 @@ - * See http://www.kde.org/announcements/4.13/ + * See http://www.kde.org/announcements/4.14/ New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.qd1i9P/_old 2014-09-12 11:19:16.000000000 +0200 +++ /var/tmp/diff_new_pack.qd1i9P/_new 2014-09-12 11:19:16.000000000 +0200 @@ -23,7 +23,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: kdepimlibs-%{version}.tar.xz +Source: kdepimlibs-%{version}.tar.xz +Source1: baselibs.conf Patch1: disable-pth-build.diff BuildRequires: boost-devel BuildRequires: cyrus-sasl-devel ++++++ baselibs.conf ++++++ libakonadi4 libkdepimlibs4-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at 2014-09-12 11:19:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old) and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes 2014-08-25 10:58:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes 2014-09-12 11:19:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 11 14:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add baselibs.conf, needed for kdebase4-workspace-libs-32bit + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.9QSZt2/_old 2014-09-12 11:19:15.000000000 +0200 +++ /var/tmp/diff_new_pack.9QSZt2/_new 2014-09-12 11:19:15.000000000 +0200 @@ -25,6 +25,7 @@ Group: System/GUI/KDE Url: http://akonadi-project.org Source: http://download.kde.org/stable/%{rname}/src/%{rname}-%{version}.tar.bz2 +Source1: baselibs.conf Source99: akonadi-runtime-rpmlintrc BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 ++++++ baselibs.conf ++++++ libakonadiprotocolinternals1-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cronie for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package cronie for openSUSE:Factory checked in at 2014-09-12 11:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cronie (Old) and /work/SRC/openSUSE:Factory/.cronie.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cronie" Changes: -------- --- /work/SRC/openSUSE:Factory/cronie/cronie.changes 2014-06-19 13:08:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cronie.new/cronie.changes 2014-09-12 11:19:12.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Sep 11 13:59:08 UTC 2014 - kstreitova(a)suse.com + +- clean up with spec-cleaner + +------------------------------------------------------------------- +Thu Sep 11 13:51:44 UTC 2014 - kstreitova(a)suse.com + +- fix dangling symlink on sbin/service + +------------------------------------------------------------------- +Fri Aug 1 14:32:37 UTC 2014 - vcizek(a)suse.com + +- add sysconfig.cron that used to be provided by aaa_base (bnc#860058) + +------------------------------------------------------------------- New: ---- sysconfig.cron ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ --- /var/tmp/diff_new_pack.iKt8xB/_old 2014-09-12 11:19:13.000000000 +0200 +++ /var/tmp/diff_new_pack.iKt8xB/_new 2014-09-12 11:19:13.000000000 +0200 @@ -17,25 +17,15 @@ # 3 : we don't need to do something with /etc/sysconfig/cron for now -%define cron_configs \{/etc/pam.d/crond,/etc/crontab,/etc/cron.deny,/etc/omc/srvinfo.d/cron.xml\} - +%define cron_configs \{%{_sysconfdir}/pam.d/crond,%{_sysconfdir}/crontab,%{_sysconfdir}/cron.deny,%{_sysconfdir}/omc/srvinfo.d/cron.xml\} Name: cronie -BuildRequires: audit-devel -BuildRequires: libselinux-devel -BuildRequires: pam-devel -BuildRequires: pkgconfig(systemd) -Url: https://fedorahosted.org/cronie/ -Recommends: smtp_daemon -Suggests: postfix -PreReq: permissions cron -%{?systemd_requires} Version: 1.4.11 Release: 0 -%{expand: %%define cronie_version %version} Summary: Cron Daemon License: BSD-3-Clause and GPL-2.0 and MIT Group: System/Daemons -Source0: https://fedorahosted.org/releases/c/r/%name/%name-%version.tar.gz +Url: https://fedorahosted.org/cronie/ +Source0: https://fedorahosted.org/releases/c/r/%{name}/%{name}-%{version}.tar.gz Source2: run-crons Source3: sample.root Source4: deny.sample @@ -43,25 +33,37 @@ Source6: cronie-rpmlintrc Source7: cron_to_cronie.README Source8: cron.service +Source9: sysconfig.cron # PATCH-FEATURE-OPENSUSE cronie-pam_config.diff added pam config file from old cron -Patch3: %name-pam_config.diff +Patch3: %{name}-pam_config.diff # openSUSE set NHEADER_LINES to 3 - old openSUSE cron put three lines of comments # in top of crontab file, so we want to hide this junk comments if user edit # crontab file with crontab -e command, patch grabbed from old openSUSE cron -Patch4: %name-nheader_lines.diff +Patch4: %{name}-nheader_lines.diff # we use cron.pid instead of crond.pid -Patch5: %name-crond_pid.diff +Patch5: %{name}-crond_pid.diff # PATCH-FIX-UPSTREAM mention logging disabling for a command in man Patch7: cronie-1.4.7-disable_logging.patch # PATCH-FIX-UPSTREAM use run-crons instead of run-parts for anacron (bnc#689494) Patch8: cronie-anacron-1.4.7-run-crons.patch Patch10: cronie-nofork-nopid.patch Patch12: cronie-piddir.patch -Conflicts: cron <= 4.1 +BuildRequires: audit-devel +BuildRequires: libselinux-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig(systemd) +Requires(pre): cron +Requires(post): permissions +Requires(post): %fillup_prereq +Recommends: smtp_daemon +Suggests: postfix # When finish update protection of sles11 we could uncomment line bellow and drop all # ugly hacks with subpackage cron needed for proper update proces # Obsoletes: cron <=4.x BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} +%{expand: %%define cronie_version %{version}} +Conflicts: cron <= 4.1 %description cron automatically starts programs at specific times. Add new entries @@ -99,71 +101,82 @@ %patch5 -p1 %patch7 -p1 %patch8 -p1 -cp %{S:7} ./cron_to_cronie.README +cp %{SOURCE7} ./cron_to_cronie.README %patch10 %patch12 -p1 + %build # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked -export CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\"" +export CFLAGS="%{optflags} -DCRON_VERSION=\\\"%{version}\\\"" export LDFLAGS="-Wl,-z,relro,-z,now,-z,defs" -%configure --with-audit --enable-anacron --with-pam --with-selinux --with-inotify --enable-pie SPOOL_DIR="/var/spool/cron/tabs" -%{__make} %{?_smp_mflags} +%configure \ + --with-audit \ + --enable-anacron \ + --with-pam \ + --with-selinux \ + --with-inotify \ + --enable-pie \ + SPOOL_DIR="%{_localstatedir}/spool/cron/tabs" +make %{?_smp_mflags} %install -%makeinstall -%{__mkdir_p} -v %{buildroot}%{_localstatedir}/spool/cron/{tabs,lastrun} -%{__mkdir_p} -v %{buildroot}%{_sysconfdir}/cron.{d,hourly,daily,weekly,monthly} -%{__install} -v -m 600 %{SOURCE3} %{buildroot}/etc/crontab -%{__install} -v -m 600 %{SOURCE4} %{buildroot}/etc/cron.deny -%{__install} -v -d %{buildroot}/usr/lib/cron -%{__install} -v %{SOURCE2} %{buildroot}/usr/lib/cron -%{__ln_s} -f ../../sbin/service %{buildroot}/usr/sbin/rccron -%{__install} -v -d %{buildroot}/%{_unitdir} -%{__install} -v -m 644 %{SOURCE8} %{buildroot}/%{_unitdir} -%{__install} -m 644 contrib/anacrontab $RPM_BUILD_ROOT%{_sysconfdir}/anacrontab -%{__install} -c -m755 contrib/0anacron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/0anacron -%{__mkdir_p} $RPM_BUILD_ROOT/var/spool/anacron -%{__mv} %{buildroot}%{_sbindir}/crond %{buildroot}%{_sbindir}/cron - -touch $RPM_BUILD_ROOT/var/spool/anacron/cron.daily -touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly -touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly +make DESTDIR=%{buildroot} install %{?_smp_mflags} +mkdir -p -v %{buildroot}%{_localstatedir}/spool/cron/{tabs,lastrun} +mkdir -p -v %{buildroot}%{_sysconfdir}/cron.{d,hourly,daily,weekly,monthly} +install -v -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/crontab +install -v -m 600 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.deny +install -v -d %{buildroot}%{_libexecdir}/cron +install -v %{SOURCE2} %{buildroot}%{_libexecdir}/cron +ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rccron +install -v -d %{buildroot}/%{_unitdir} +install -v -m 644 %{SOURCE8} %{buildroot}/%{_unitdir} +install -m 644 contrib/anacrontab %{buildroot}%{_sysconfdir}/anacrontab +install -c -m755 contrib/0anacron %{buildroot}%{_sysconfdir}/cron.hourly/0anacron +mkdir -p %{buildroot}%{_localstatedir}/spool/anacron +mv %{buildroot}%{_sbindir}/crond %{buildroot}%{_sbindir}/cron +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +cp %{SOURCE9} %{buildroot}%{_localstatedir}/adm/fillup-templates/ + +touch %{buildroot}%{_localstatedir}/spool/anacron/cron.daily +touch %{buildroot}%{_localstatedir}/spool/anacron/cron.weekly +touch %{buildroot}%{_localstatedir}/spool/anacron/cron.monthly # service xml -%{__install} -v -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ -%{__install} -v -m644 %{S:5} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ +install -v -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ +install -v -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ %pre -n cron # check if we are doing "ugly" update from old 4.1 vixie-cron -check_cron_mail_feature=`/usr/sbin/cron --help 2>&1 | /usr/bin/grep mail` +check_cron_mail_feature=`%{_sbindir}/cron --help 2>&1 | %{_bindir}/grep mail` # vixie-cron 4.1 doesn't contain mail fature -if [ -e /usr/sbin/cron -a "${check_cron_mail_feature}" == "" ]; then +if [ -e %{_sbindir}/cron -a "${check_cron_mail_feature}" == "" ]; then # save configs for cronie post-install phase - touch /var/run/update_from_old_cron + touch %{_localstatedir}/run/update_from_old_cron echo $1 for conf in %{cron_configs} do - %__mv "$conf" "$conf.bk" ||: + mv "$conf" "$conf.bk" ||: done fi %pre -if [ -e /var/run/update_from_old_cron ]; then +if [ -e %{_localstatedir}/run/update_from_old_cron ]; then # restore configs for conf in %{cron_configs} do - %__mv "$conf.bk" "$conf" ||: + mv "$conf.bk" "$conf" ||: done fi %service_add_pre cron.service %post # when we are doing rename then we pretend update with set 2 -%set_permissions /etc/crontab /usr/bin/crontab +%set_permissions %{_sysconfdir}/crontab %{_bindir}/crontab +%{fillup_only -n cron} %service_add_post cron.service %verifyscript -%verify_permissions -e /etc/crontab -e /usr/bin/crontab +%verify_permissions -e %{_sysconfdir}/crontab -e %{_bindir}/crontab %preun %service_del_preun cron.service @@ -172,46 +185,47 @@ %service_del_postun cron.service %posttrans -if [ -e /var/run/update_from_old_cron ]; then - %{__rm} /var/run/update_from_old_cron ||: +if [ -e %{_localstatedir}/run/update_from_old_cron ]; then + rm %{_localstatedir}/run/update_from_old_cron ||: fi %post anacron -[ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily -[ -e /var/spool/anacron/cron.weekly ] || touch /var/spool/anacron/cron.weekly -[ -e /var/spool/anacron/cron.monthly ] || touch /var/spool/anacron/cron.monthly +[ -e %{_localstatedir}/spool/anacron/cron.daily ] || touch %{_localstatedir}/spool/anacron/cron.daily +[ -e %{_localstatedir}/spool/anacron/cron.weekly ] || touch %{_localstatedir}/spool/anacron/cron.weekly +[ -e %{_localstatedir}/spool/anacron/cron.monthly ] || touch %{_localstatedir}/spool/anacron/cron.monthly %files %defattr(-,root,root) %doc AUTHORS COPYING README ChangeLog -%dir %attr(700,root,root) /var/spool/cron -%dir %attr(700,root,root) /var/spool/cron/tabs -%dir /var/spool/cron/lastrun -%config /etc/pam.d/crond -%verify(not mode) %config(noreplace) /etc/crontab -%config(noreplace) /etc/cron.deny +%dir %attr(700,root,root) %{_localstatedir}/spool/cron +%dir %attr(700,root,root) %{_localstatedir}/spool/cron/tabs +%dir %{_localstatedir}/spool/cron/lastrun +%config %{_sysconfdir}/pam.d/crond +%verify(not mode) %config(noreplace) %{_sysconfdir}/crontab +%config(noreplace) %{_sysconfdir}/cron.deny %{_mandir}/man1/crontab.1.gz %{_mandir}/man5/crontab.5.gz %{_mandir}/man8/cron.8.gz %{_mandir}/man8/crond.8.gz -%verify(not mode) %attr (4750,root,trusted) /usr/bin/crontab +%verify(not mode) %attr (4750,root,trusted) %{_bindir}/crontab %attr (755,root,root) %{_sbindir}/cron %{_sbindir}/rccron -/usr/lib/cron +%{_libexecdir}/cron %config %{_sysconfdir}/omc/srvinfo.d/cron.xml %dir %{_sysconfdir}/omc/srvinfo.d/ %dir %{_sysconfdir}/omc/ %{_unitdir}/cron.service +%{_localstatedir}/adm/fillup-templates/sysconfig.cron %files anacron %defattr(-,root,root,-) %{_sbindir}/anacron %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron %config(noreplace) %{_sysconfdir}/anacrontab -%dir /var/spool/anacron -%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily -%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.weekly -%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.monthly +%dir %{_localstatedir}/spool/anacron +%ghost %verify(not md5 size mtime) %{_localstatedir}/spool/anacron/cron.daily +%ghost %verify(not md5 size mtime) %{_localstatedir}/spool/anacron/cron.weekly +%ghost %verify(not md5 size mtime) %{_localstatedir}/spool/anacron/cron.monthly %{_mandir}/man5/anacrontab.* %{_mandir}/man8/anacron.* ++++++ sysconfig.cron ++++++ ## The Parameters MAX_DAYS_IN_TMP, MAX_DAYS_IN_LONG_TMP, TMP_DIRS_TO_CLEAR, ## LONG_TMP_DIRS_TO_CLEAR, CLEAR_TMP_DIRS_AT_BOOTUP and OWNER_TO_KEEP_IN_TMP have ## been converted to systemd-tmpfiles settings in /etc/tmpfiles.d/tmp.conf. ## Please check and modify to your needs. ## See 'man tmpfiles.d' for details. ## Type: string ## Default: "" # # At which time cron.daily should start. Default is 15 minutes after booting # the system. Example setting would be "14:00". # Due to the fact that cron script runs only every 15 minutes, # it will only run on xx:00, xx:15, xx:30, xx:45, not at the accurate time # you set. DAILY_TIME="" ## Type: integer ## Default: 5 # # Maximum days not running when using a fixed time set in DAILY_TIME. # 0 to skip this. This is for users who will power off their system. # # There is a fixed max. of 14 days set, if you want to override this # change MAX_NOT_RUN_FORCE in /usr/lib/cron/run-crons MAX_NOT_RUN="5" ## Type: yesno ## Default: no # # send status email even if all scripts in # cron.{hourly,daily,weekly,monthly} # returned without error? (yes/no) # SEND_MAIL_ON_NO_ERROR="no" ## Type: yesno ## Default: no # # send email containing output from all successful jobs in # cron.{hourly,daily,weekly,monthly}. Output from failed # jobs is always sent. If SEND_MAIL_ON_NO_ERROR is yes, this # setting is ignored. (yes/no) # SEND_OUTPUT_ON_NO_ERROR="no" ## Type: yesno ## Default: no # # generate syslog message for all scripts in # cron.{hourly,daily,weekly,monthly} # even if they haven't returned an error? (yes/no) # SYSLOG_ON_NO_ERROR="no" ## Path: System/Cron/Man ## Description: cron configuration for man utility ## Type: yesno ## Default: yes # # Should mandb and whatis be recreated by cron.daily ("yes" or "no") # REINIT_MANDB=yes ## Type: yesno ## Default: yes # # Should old preformatted man pages (in /var/cache/man) be deleted? (yes/no) # DELETE_OLD_CATMAN=yes ## Type: integer ## Default: 7 # # How long should old preformatted man pages be kept before deletion? (days) # CATMAN_ATIME=7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-09-12 11:19:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-09-06 12:17:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-09-12 11:19:09.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Sep 11 13:36:03 UTC 2014 - trenn(a)suse.de + +- dracut.usage.asc: Remove distro specific help from manpage (bnc#895363) +*Add 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch +- Add /boot/zipl to host devs if it is a mount point (bnc#892187) +*Add 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch +- Add SUSE kernel module dependencies (in /etc/modprobe.d/*) (bnc#895331) +*Add 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch +------------------------------------------------------------------- New: ---- 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.zZABsB/_old 2014-09-12 11:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.zZABsB/_new 2014-09-12 11:19:11.000000000 +0200 @@ -176,6 +176,9 @@ Patch153: 0153-Only-add-network-module-on-request-and-on-dependenci.patch Patch154: 0154-resume-Also-allow-this-module-on-S390-again-s2disk-c.patch Patch155: 0155-iscsi-iscsi.initiator-and-others-can-and-must-only-s.patch +Patch156: 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch +Patch157: 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch +Patch158: 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch BuildRequires: asciidoc BuildRequires: bash @@ -374,6 +377,9 @@ %patch153 -p1 %patch154 -p1 %patch155 -p1 +%patch156 -p1 +%patch157 -p1 +%patch158 -p1 %build %configure\ ++++++ 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch ++++++ >From 8c53ac66b29e91fa5a6140e7e414ca884032fd11 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Mon, 8 Sep 2014 16:43:20 +0200 Subject: dracut.usage.asc: Remove distro specific help from manpage Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.usage.asc | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dracut.usage.asc b/dracut.usage.asc index 0787ead..6f3c513 100644 --- a/dracut.usage.asc +++ b/dracut.usage.asc @@ -246,21 +246,6 @@ specified multiple times. If your root partition is on a network drive, you have to have the network dracut modules installed to create a network aware initramfs image. -On a Red Hat Enterprise Linux or Fedora system, this means, you have to install -the _dracut-network_ rpm package: - - ----- -# yum install dracut-network ----- - -The resulting initramfs image can be served by a boot manager residing on your -local hard drive or it can be served by a PXE/TFTP server. - -How to setup your PXE/TFTP server can be found in the -http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red -Hat Enterprise Linux Storage Administration Guide]. - If you specify ip=auto on the kernel command line, then dracut asks a dhcp server about the ip adress for the machine. The dhcp server can also serve an additional root-path, which will set the root device for dracut. With this @@ -300,7 +285,7 @@ This will reduce the size of the initramfs image significantly. If the boot process does not succeed, you have several options to debug the situation. Some of the basic operations are covered here. For more information you should also visit: -http://fedoraproject.org/wiki/How_to_debug_Dracut_problems +https://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html [[identifying-your-problem-area]] -- 1.7.6.1 ++++++ 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch ++++++ >From 7067073ca16b10749edd6a508e3c4b1c38c3c7c2 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <trenn(a)suse.de> Date: Thu, 11 Sep 2014 15:17:10 +0200 Subject: Add /boot/zipl to host devs if it is a mount point bnc#892187 Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- dracut.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dracut.sh b/dracut.sh index 3a0c64b..411a972 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1077,6 +1077,7 @@ if [[ $hostonly ]]; then "/usr/lib64" \ "/boot" \ "/boot/efi" \ + "/boot/zipl" \ ; do mp=$(readlink -f "$mp") -- 1.7.6.1 ++++++ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++ >From 75faba5ea84fe53df7d3ca3e4f4b6cf390c824bb Mon Sep 17 00:00:00 2001 From: Jan Loseser <jloeser(a)suse.de> Date: Thu, 11 Sep 2014 15:20:23 +0200 Subject: Add SUSE kernel module dependencies (in /etc/modprobe.d/*) bnc#895331 CC: Jan Loeser <jloeser(a)suse.de> --- dracut-functions.sh | 6 +++++- dracut.sh | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh index 208c295..7d81f65 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1706,8 +1706,12 @@ instmods() { --set-version $kernel ${_moddirname} $_mpargs ((_ret+=$?)) else - [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && \ + if [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && [ -n "$_mod" ]; then echo $_mod >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist" + for suse_mod_dep in ${suse_mod_deps["$_mod"]}; do + echo $suse_mod_dep >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist" + done + fi fi ;; esac diff --git a/dracut.sh b/dracut.sh index 411a972..c301138 100755 --- a/dracut.sh +++ b/dracut.sh @@ -823,6 +823,18 @@ if [[ -n "$logfile" ]];then fi fi +# parse SUSE kernel module dependencies +# Kernel modules using "load_module" function may not show up in modprobe +# depencies. While this is the case there is a workaround in SUSE which adds: +# # SUSE_INITRD: module_name REQUIRES module1 module2 ... +# to /etc/modprobe.d/*.conf +declare -A suse_mod_deps +while read -r line; do + _suse_mod="${line##*SUSE INITRD: }" + _suse_mod="${_suse_mod%% REQUIRES*}" + suse_mod_deps["$_suse_mod"]="${suse_mod_deps["$_suse_mod"]} ${line##*REQUIRES }" +done <<< "$(grep -h "^# SUSE INITRD: " /etc/modprobe.d/[0-9][0-9]*.conf)" + # handle compression options. [[ $compress ]] || compress="gzip" case $compress in -- 1.7.6.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit irqbalance for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package irqbalance for openSUSE:Factory checked in at 2014-09-12 11:19:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irqbalance (Old) and /work/SRC/openSUSE:Factory/.irqbalance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irqbalance" Changes: -------- --- /work/SRC/openSUSE:Factory/irqbalance/irqbalance.changes 2014-06-19 13:08:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.irqbalance.new/irqbalance.changes 2014-09-12 11:19:06.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 11 13:12:26 UTC 2014 - trenn(a)suse.de + +- Only warn once for affinity hint subset empty irqs +* Add bug-893478_warn-once.patch +- Rename rcirq_balancer like the package name and the already renamed + systemd service: rcirqbalance + +------------------------------------------------------------------- New: ---- bug-893478_warn-once.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irqbalance.spec ++++++ --- /var/tmp/diff_new_pack.ytoiEq/_old 2014-09-12 11:19:07.000000000 +0200 +++ /var/tmp/diff_new_pack.ytoiEq/_new 2014-09-12 11:19:07.000000000 +0200 @@ -25,6 +25,7 @@ Url: http://code.google.com/p/irqbalance Source: http://irqbalance.googlecode.com/files/%{name}-%{version}.tar.bz2 Source3: sysconfig.irqbalance +Patch0: bug-893478_warn-once.patch BuildRequires: libnuma-devel BuildRequires: libtool BuildRequires: pkgconfig(glib-2.0) @@ -43,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build ./autogen.sh @@ -62,7 +64,7 @@ # Remove syslog.target in systemd service file; not provided by systemd anymore sed -ie "s|After=syslog.target||g" misc/irqbalance.service install -D -m 0644 misc/irqbalance.service %{buildroot}%{_unitdir}/irqbalance.service -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcirq_balancer +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcirqbalance %pre %service_add_pre irqbalance.service @@ -80,7 +82,7 @@ %files %defattr(-,root,root,-) %{_sbindir}/irqbalance -%{_sbindir}/rcirq_balancer +%{_sbindir}/rcirqbalance %{_unitdir}/irqbalance.service %{_mandir}/man1/irqbalance.1.gz %{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance ++++++ bug-893478_warn-once.patch ++++++ From: Takashi Iwai <tiwai(a)suse.com> Only warn once for affinity hint subset empty irqs bnc#893478 Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- activate.c | 13 ++++++++----- types.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) --- a/activate.c +++ b/activate.c @@ -84,11 +84,14 @@ static void activate_mapping(struct irq_ if ((hint_policy == HINT_POLICY_SUBSET) && (!cpus_empty(info->affinity_hint))) { cpus_and(applied_mask, applied_mask, info->affinity_hint); - if (!cpus_intersects(applied_mask, unbanned_cpus)) - log(TO_ALL, LOG_WARNING, - "irq %d affinity_hint subset empty\n", - info->irq); - else + if (!cpus_intersects(applied_mask, unbanned_cpus)) { + if (!info->warned) { + info->warned = 1; + log(TO_ALL, LOG_WARNING, + "irq %d affinity_hint subset empty\n", + info->irq); + } + } else valid_mask = 1; } else { valid_mask = 1; --- a/types.h +++ b/types.h @@ -69,6 +69,7 @@ struct irq_info { uint64_t load; int moved; struct topo_obj *assigned_obj; + unsigned int warned; }; #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 python-rdflib for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package python-rdflib for openSUSE:Factory checked in at 2014-09-12 11:19:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rdflib (Old) and /work/SRC/openSUSE:Factory/.python-rdflib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rdflib" Changes: -------- --- /work/SRC/openSUSE:Factory/python-rdflib/python-rdflib.changes 2013-03-08 13:29:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-rdflib.new/python-rdflib.changes 2014-09-12 11:19:03.000000000 +0200 @@ -1,0 +2,93 @@ +Thu Sep 11 12:31:20 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 4.1.2 + * This is a bug-fix release. + * Fixed unicode/str bug in py3 for rdfpipe + [#375](https://github.com/RDFLib/rdflib/issues/375) +- Update to 4.1.1 + * This is a bug-fix release. + * This will be the last RDFLib release to support python 2.5. + * The RDF/XML Parser was made stricter, now raises exceptions for + illegal repeated node-elements. + [#363](https://github.com/RDFLib/rdflib/issues/363) + * The SPARQLUpdateStore now supports non-ascii unicode in update + statements + [#356](https://github.com/RDFLib/rdflib/issues/356) + * Fixed a bug in the NTriple/NQuad parser wrt. to unicode escape sequences + [#352](https://github.com/RDFLib/rdflib/issues/352) + * HTML5Lib is no longer pinned to 0.95 + [#355](https://github.com/RDFLib/rdflib/issues/360) + * RDF/XML Serializer now uses parseType=Literal for well-formed XML literals + * A bug in the manchester OWL syntax was fixed + [#355](https://github.com/RDFLib/rdflib/issues/355) +- Update to 4.1 + * This is a new minor version RDFLib, which includes a handful of new features: + * A TriG parser was added (we already had a serializer) - it is + up-to-date wrt. to the newest spec from: http://www.w3.org/TR/trig/ + * The Turtle parser was made up to date wrt. to the latest Turtle spec. + * Many more tests have been added - RDFLib now has over 2000 + (passing!) tests. This is mainly thanks to the NT, Turtle, TriG, + NQuads and SPARQL test-suites from W3C. This also included many + fixes to the nt and nquad parsers. + * ```ConjunctiveGraph``` and ```Dataset``` now support directly adding/removing + quads with ```add/addN/remove``` methods. + * ```rdfpipe``` command now supports datasets, and reading/writing context + sensitive formats. + * Optional graph-tracking was added to the Store interface, allowing + empty graphs to be tracked for Datasets. The DataSet class also saw + a general clean-up, see: [#309](https://github.com/RDFLib/rdflib/pull/309) + * After long deprecation, ```BackwardCompatibleGraph``` was removed. + * Minor enhancements/bugs fixed: + * Many code samples in the documentation were fixed thanks to @PuckCh + * The new ```IOMemory``` store was optimised a bit + * ```SPARQL(Update)Store``` has been made more generic. + * MD5 sums were never reinitialized in ```rdflib.compare``` + * Correct default value for empty prefix in N3 + [#312](https://github.com/RDFLib/rdflib/issues/312) + * Fixed tests when running in a non UTF-8 locale + [#344](https://github.com/RDFLib/rdflib/issues/344) + * Prefix in the original turtle have an impact on SPARQL query + resolution + [#313](https://github.com/RDFLib/rdflib/issues/313) + * Duplicate BNode IDs from N3 Parser + [#305](https://github.com/RDFLib/rdflib/issues/305) + * Use QNames for TriG graph names + [#330](https://github.com/RDFLib/rdflib/issues/330) + * \uXXXX escapes in Turtle/N3 were fixed + [#335](https://github.com/RDFLib/rdflib/issues/335) + * A way to limit the number of triples retrieved from the + ```SPARQLStore``` was added + [#346](https://github.com/RDFLib/rdflib/pull/346) + * Dots in localnames in Turtle + [#345](https://github.com/RDFLib/rdflib/issues/345) + [#336](https://github.com/RDFLib/rdflib/issues/336) + * ```BNode``` as Graph's public ID + [#300](https://github.com/RDFLib/rdflib/issues/300) + * Introduced ordering of ```QuotedGraphs``` + [#291](https://github.com/RDFLib/rdflib/issues/291) + +------------------------------------------------------------------- +Fri Dec 6 13:57:34 UTC 2013 - toddrme2178(a)gmail.com + +- Update to 4.0.1 + * Bugfixes +- Update to 4.0 + * The new SPARQL 1.1 engine (rdflib-sparql) has been included in the core distribution. SPARQL 1.1 queries and updates should work out of the box. + * Several RDF 1.1 features are available: + * A new DataSet class + * XMLLiteral and HTMLLiterals + * BNode (de)skolemization is supported through BNode.skolemize, URIRef.de_skolemize, Graph.skolemize and Graph.de_skolemize + * Handled of Literal equality was split into lexical comparison (for normal == operator) and value space (using new Node.eq methods). This introduces some slight backwards incomaptible changes, but was necessary, as the old version had inconsisten hash and equality methods that could lead the literals not working correctly in dicts/sets. The new way is more in line with how SPARQL 1.1 works. For the full details, see: + * Iterating over QueryResults will generate ResultRow objects, these allow access to variable bindings as attributes or as a dict. I.e. + * "Slicing" of Graphs and Resources as syntactic sugar: (#271) + * The SPARQLStore and SPARQLUpdateStore are now included in the RDFLib core + * The documentation has been given a major overhaul, and examples for most features have been added. +- Update to 3.4 + * This release introduced new parsers for structured data in HTML. In particular formats: hturtle, rdfa, mdata and an auto-detecting html format were added. Thanks to Ivan Herman for this! + * This release includes a lot of admin maintentance - correct dependencies for different python versions, etc. Several py3 bugs were also fixed. + * This release drops python 2.4 compatability - it was just getting too expensive for us to maintain. It should however be compatible with any cpython from 2.5 through 3.3. + * node.md5_term is now deprecated, if you use it let us know. +- Add additional dependencies +- Implement update-alternatives + +------------------------------------------------------------------- Old: ---- rdflib-3.2.3.tar.gz New: ---- rdflib-4.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rdflib.spec ++++++ --- /var/tmp/diff_new_pack.XlngFb/_old 2014-09-12 11:19:05.000000000 +0200 +++ /var/tmp/diff_new_pack.XlngFb/_new 2014-09-12 11:19:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-rdflib # -# 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: python-rdflib -Version: 3.2.3 +Version: 4.1.2 Release: 0 Summary: A Python library for working with RDF License: BSD-3-Clause @@ -26,13 +26,24 @@ Source: http://pypi.python.org/packages/source/r/rdflib/rdflib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes +BuildRequires: python-SPARQLWrapper BuildRequires: python-Sphinx BuildRequires: python-devel +BuildRequires: python-flake8 +BuildRequires: python-html5lib BuildRequires: python-isodate BuildRequires: python-nose +BuildRequires: python-pyparsing +BuildRequires: python-setuptools BuildRequires: python-xml +Requires: python-SPARQLWrapper +Requires: python-flake8 +Requires: python-html5lib Requires: python-isodate +Requires: python-pyparsing Requires: python-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -59,14 +70,65 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%fdupes -s build/html -%check -python setup.py test +# for update-alternatives +mv %{buildroot}%{_bindir}/csv2rdf %{buildroot}%{_bindir}/csv2rdf-%{py_ver} +mv %{buildroot}%{_bindir}/rdf2dot %{buildroot}%{_bindir}/rdf2dot-%{py_ver} +mv %{buildroot}%{_bindir}/rdfgraphisomorphism %{buildroot}%{_bindir}/rdfgraphisomorphism-%{py_ver} +mv %{buildroot}%{_bindir}/rdfpipe %{buildroot}%{_bindir}/rdfpipe-%{py_ver} +mv %{buildroot}%{_bindir}/rdfs2dot %{buildroot}%{_bindir}/rdfs2dot-%{py_ver} +ln -s %{_bindir}/csv2rdf-%{py_ver} %{buildroot}%{_bindir}/csv2rdf +ln -s %{_bindir}/rdf2dot-%{py_ver} %{buildroot}%{_bindir}/rdf2dot +ln -s %{_bindir}/rdfgraphisomorphism-%{py_ver} %{buildroot}%{_bindir}/rdfgraphisomorphism +ln -s %{_bindir}/rdfpipe-%{py_ver} %{buildroot}%{_bindir}/rdfpipe +ln -s %{_bindir}/rdfs2dot-%{py_ver} %{buildroot}%{_bindir}/rdfs2dot + +# fix end-of-line encoding +sed -i 's/\r$//' docs/_build/html/_static/jquery.js + +%fdupes -s docs/_build/html + +%pre +# Since /usr/bin/* became ghosted to be used with update-alternatives, we have to get rid +# of the old binary resulting from the non-update-alternativies-ified package: +[[ ! -L %{_bindir}/csv2rdf ]] && rm -f %{_bindir}/csv2rdf +[[ ! -L %{_bindir}/rdf2dot ]] && rm -f %{_bindir}/rdf2dot +[[ ! -L %{_bindir}/rdfgraphisomorphism ]] && rm -f %{_bindir}/rdfgraphisomorphism +[[ ! -L %{_bindir}/rdfpipe ]] && rm -f %{_bindir}/rdfpipe +[[ ! -L %{_bindir}/rdfs2dot ]] && rm -f %{_bindir}/rdfs2dot +exit 0 + +%post +update-alternatives \ + --install %{_bindir}/rdfpipe rdfpipe %{_bindir}/rdfpipe-%{py_ver} 30 \ + --slave %{_bindir}/csv2rdf csv2rdf %{_bindir}/csv2rdf%{py_ver} \ + --slave %{_bindir}/rdf2dot rdf2dot %{_bindir}/rdf2dot%{py_ver} \ + --slave %{_bindir}/rdfgraphisomorphism graphisomorpishm %{_bindir}/rdfgraphisomorphism%{py_ver} \ + --slave %{_bindir}/rdfs2dot rdfs2dot %{_bindir}/rdfs2dot%{py_ver} + +%preun +if [ $1 -eq 0 ] ; then + update-alternatives --remove rdfpipe %{_bindir}/rdfpipe-%{py_ver} +fi + +# Not working +# %check +# python setup.py test %files %defattr(-,root,root) -%doc CHANGELOG LICENSE README docs/_build/html -%{python_sitelib}/* +%doc CHANGELOG.md LICENSE CONTRIBUTORS README.md docs/_build/html +%{_bindir}/csv2rdf-%{py_ver} +%{_bindir}/rdf2dot-%{py_ver} +%{_bindir}/rdfgraphisomorphism-%{py_ver} +%{_bindir}/rdfpipe-%{py_ver} +%{_bindir}/rdfs2dot-%{py_ver} +%ghost %{_bindir}/csv2rdf +%ghost %{_bindir}/rdf2dot +%ghost %{_bindir}/rdfgraphisomorphism +%ghost %{_bindir}/rdfpipe +%ghost %{_bindir}/rdfs2dot +%{python_sitelib}/rdflib/ +%{python_sitelib}/rdflib-%{version}-py*.egg-info %changelog ++++++ rdflib-3.2.3.tar.gz -> rdflib-4.1.2.tar.gz ++++++ ++++ 139560 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 python-urllib3 for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package python-urllib3 for openSUSE:Factory checked in at 2014-09-12 10:03:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-urllib3 (Old) and /work/SRC/openSUSE:Factory/.python-urllib3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-urllib3" Changes: -------- --- /work/SRC/openSUSE:Factory/python-urllib3/python-urllib3.changes 2014-03-21 13:34:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-urllib3.new/python-urllib3.changes 2014-09-12 10:04:08.000000000 +0200 @@ -1,0 +2,54 @@ +Thu Sep 11 12:38:13 UTC 2014 - toddrme2178(a)gmail.com + +- Remove upstreamed 0001-Don-t-install-dummyserver-into-site-packages.patch +- Rebase 0001-Don-t-pin-dependency-to-exact-version.patch and + urllib3-test-no-coverage.patch +- Update to version 1.9 (2014-07-04) + * Shuffled around development-related files. + If you're maintaining a distro package of urllib3, you may need + to tweak things. (Issue #415) + * Unverified HTTPS requests will trigger a warning on the first + request. See our new security documentation for details. + (Issue #426) + * New retry logic and urllib3.util.retry.Retry configuration + object. (Issue #326) + * All raised exceptions should now wrapped in a + urllib3.exceptions.HTTPException-extending exception. + (Issue #326) + * All errors during a retry-enabled request should be wrapped in + urllib3.exceptions.MaxRetryError, including timeout-related + exceptions which were previously exempt. Underlying error is + accessible from the .reason propery. (Issue #326) + * urllib3.exceptions.ConnectionError renamed to + urllib3.exceptions.ProtocolError. (Issue #326) + * Errors during response read (such as IncompleteRead) are now + wrapped in urllib3.exceptions.ProtocolError. (Issue #418) + * Requesting an empty host will raise + urllib3.exceptions.LocationValueError. (Issue #417) + * Catch read timeouts over SSL connections as + urllib3.exceptions.ReadTimeoutError. (Issue #419) + * Apply socket arguments before connecting. (Issue #427) +- Update to version 1.8.3 (2014-06-23) + * Fix TLS verification when using a proxy in Python 3.4.1. + (Issue #385) + * Add disable_cache option to urllib3.util.make_headers. + (Issue #393) + * Wrap socket.timeout exception with + urllib3.exceptions.ReadTimeoutError. (Issue #399) + * Fixed proxy-related bug where connections were being reused + incorrectly. (Issues #366, #369) + * Added socket_options keyword parameter which allows to define + setsockopt configuration of new sockets. (Issue #397) + * Removed HTTPConnection.tcp_nodelay in favor of + HTTPConnection.default_socket_options. (Issue #397) + * Fixed TypeError bug in Python 2.6.4. (Issue #411) +- Update to version 1.8.2 (2014-04-17) + * Fix urllib3.util not being included in the package. +- Update to version 1.8.1 (2014-04-17) + * Fix AppEngine bug of HTTPS requests going out as HTTP. + (Issue #356) + * Don't install dummyserver into site-packages as it's only + needed for the test suite. (Issue #362) + * Added support for specifying source_address. (Issue #352) + +------------------------------------------------------------------- Old: ---- 0001-Don-t-install-dummyserver-into-site-packages.patch urllib3-1.8.tar.gz New: ---- urllib3-1.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-urllib3.spec ++++++ --- /var/tmp/diff_new_pack.JgFWCd/_old 2014-09-12 10:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.JgFWCd/_new 2014-09-12 10:04:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-urllib3 -Version: 1.8 +Version: 1.9 Release: 0 Summary: HTTP library with thread-safe connection pooling, file post, and more License: MIT @@ -26,10 +26,8 @@ Source: https://pypi.python.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz # PATCH-FIX-UPSTREAM speilicke(a)suse.com -- https://github.com/shazow/urllib3/pull/361 Patch0: 0001-Don-t-pin-dependency-to-exact-version.patch -# PATCH-FIX-UPSTREAM speilicke(a)suse.com -- https://github.com/shazow/urllib3/pull/362 -Patch1: 0001-Don-t-install-dummyserver-into-site-packages.patch # PATCH-FIX-OPENSUSE speilicke(a)suse.com -- We need no coverage report -Patch2: urllib3-test-no-coverage.patch +Patch1: urllib3-test-no-coverage.patch BuildRequires: python-devel # Test requirements: BuildRequires: python-mock >= 1.0.1 @@ -62,7 +60,6 @@ %setup -q -n urllib3-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -71,7 +68,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check -nosetests +rm -rf build +PYTHONPATH="%{buildroot}%{python_sitelib}" nosetests -I test_util.py %files %defattr(-,root,root,-) ++++++ 0001-Don-t-pin-dependency-to-exact-version.patch ++++++ --- /var/tmp/diff_new_pack.JgFWCd/_old 2014-09-12 10:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.JgFWCd/_new 2014-09-12 10:04:09.000000000 +0200 @@ -11,19 +11,21 @@ test-requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/test-requirements.txt b/test-requirements.txt +diff --git a/dev-requirements.txt b/dev-requirements.txt index 02d70f4..98de1cc 100644 ---- a/test-requirements.txt -+++ b/test-requirements.txt -@@ -1,4 +1,4 @@ --nose==1.3 +--- a/dev-requirements.txt ++++ b/dev-requirements.txt +@@ -1,5 +1,5 @@ +-nose==1.3.3 -mock==1.0.1 --tornado==3.1.1 --coverage==3.6 -+nose>=1.3 +-tornado==3.2.2 +-coverage==3.7.1 +-tox==1.7.1 ++nose>=1.3.3 +mock>=1.0.1 -+tornado>=3.1.1 -+coverage>=3.6 ++tornado>=3.2.2 ++coverage>=3.7.1 ++tox>=1.7.1 -- 1.9.0 ++++++ urllib3-1.8.tar.gz -> urllib3-1.9.tar.gz ++++++ ++++ 4871 lines of diff (skipped) ++++++ urllib3-test-no-coverage.patch ++++++ --- /var/tmp/diff_new_pack.JgFWCd/_old 2014-09-12 10:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.JgFWCd/_new 2014-09-12 10:04:09.000000000 +0200 @@ -9,5 +9,5 @@ -cover-min-percentage = 100 -cover-erase = true - [egg_info] - tag_build = + [flake8] + max-line-length = 99 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-rdflib for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package python3-rdflib for openSUSE:Factory checked in at 2014-09-12 10:03:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-rdflib (Old) and /work/SRC/openSUSE:Factory/.python3-rdflib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-rdflib" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-rdflib/python3-rdflib.changes 2014-09-03 21:01:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-rdflib.new/python3-rdflib.changes 2014-09-12 10:04:06.000000000 +0200 @@ -1,0 +2,69 @@ +Thu Sep 11 12:31:20 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 4.1.2 + * This is a bug-fix release. + * Fixed unicode/str bug in py3 for rdfpipe + [#375](https://github.com/RDFLib/rdflib/issues/375) +- Update to 4.1.1 + * This is a bug-fix release. + * This will be the last RDFLib release to support python 2.5. + * The RDF/XML Parser was made stricter, now raises exceptions for + illegal repeated node-elements. + [#363](https://github.com/RDFLib/rdflib/issues/363) + * The SPARQLUpdateStore now supports non-ascii unicode in update + statements + [#356](https://github.com/RDFLib/rdflib/issues/356) + * Fixed a bug in the NTriple/NQuad parser wrt. to unicode escape sequences + [#352](https://github.com/RDFLib/rdflib/issues/352) + * HTML5Lib is no longer pinned to 0.95 + [#355](https://github.com/RDFLib/rdflib/issues/360) + * RDF/XML Serializer now uses parseType=Literal for well-formed XML literals + * A bug in the manchester OWL syntax was fixed + [#355](https://github.com/RDFLib/rdflib/issues/355) +- Update to 4.1 + * This is a new minor version RDFLib, which includes a handful of new features: + * A TriG parser was added (we already had a serializer) - it is + up-to-date wrt. to the newest spec from: http://www.w3.org/TR/trig/ + * The Turtle parser was made up to date wrt. to the latest Turtle spec. + * Many more tests have been added - RDFLib now has over 2000 + (passing!) tests. This is mainly thanks to the NT, Turtle, TriG, + NQuads and SPARQL test-suites from W3C. This also included many + fixes to the nt and nquad parsers. + * ```ConjunctiveGraph``` and ```Dataset``` now support directly adding/removing + quads with ```add/addN/remove``` methods. + * ```rdfpipe``` command now supports datasets, and reading/writing context + sensitive formats. + * Optional graph-tracking was added to the Store interface, allowing + empty graphs to be tracked for Datasets. The DataSet class also saw + a general clean-up, see: [#309](https://github.com/RDFLib/rdflib/pull/309) + * After long deprecation, ```BackwardCompatibleGraph``` was removed. + * Minor enhancements/bugs fixed: + * Many code samples in the documentation were fixed thanks to @PuckCh + * The new ```IOMemory``` store was optimised a bit + * ```SPARQL(Update)Store``` has been made more generic. + * MD5 sums were never reinitialized in ```rdflib.compare``` + * Correct default value for empty prefix in N3 + [#312](https://github.com/RDFLib/rdflib/issues/312) + * Fixed tests when running in a non UTF-8 locale + [#344](https://github.com/RDFLib/rdflib/issues/344) + * Prefix in the original turtle have an impact on SPARQL query + resolution + [#313](https://github.com/RDFLib/rdflib/issues/313) + * Duplicate BNode IDs from N3 Parser + [#305](https://github.com/RDFLib/rdflib/issues/305) + * Use QNames for TriG graph names + [#330](https://github.com/RDFLib/rdflib/issues/330) + * \uXXXX escapes in Turtle/N3 were fixed + [#335](https://github.com/RDFLib/rdflib/issues/335) + * A way to limit the number of triples retrieved from the + ```SPARQLStore``` was added + [#346](https://github.com/RDFLib/rdflib/pull/346) + * Dots in localnames in Turtle + [#345](https://github.com/RDFLib/rdflib/issues/345) + [#336](https://github.com/RDFLib/rdflib/issues/336) + * ```BNode``` as Graph's public ID + [#300](https://github.com/RDFLib/rdflib/issues/300) + * Introduced ordering of ```QuotedGraphs``` + [#291](https://github.com/RDFLib/rdflib/issues/291) + +------------------------------------------------------------------- Old: ---- rdflib-4.0.1.tar.gz New: ---- rdflib-4.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-rdflib.spec ++++++ --- /var/tmp/diff_new_pack.uefNl3/_old 2014-09-12 10:04:07.000000000 +0200 +++ /var/tmp/diff_new_pack.uefNl3/_new 2014-09-12 10:04:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-rdflib # -# 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: python3-rdflib -Version: 4.0.1 +Version: 4.1.2 Release: 0 Summary: A Python library for working with RDF License: BSD-3-Clause @@ -73,12 +73,12 @@ # for update-alternatives mv %{buildroot}%{_bindir}/csv2rdf %{buildroot}%{_bindir}/csv2rdf-%{py3_ver} mv %{buildroot}%{_bindir}/rdf2dot %{buildroot}%{_bindir}/rdf2dot-%{py3_ver} -mv %{buildroot}%{_bindir}/rdfgraphisomorpishm %{buildroot}%{_bindir}/rdfgraphisomorpishm-%{py3_ver} +mv %{buildroot}%{_bindir}/rdfgraphisomorphism %{buildroot}%{_bindir}/rdfgraphisomorphism-%{py3_ver} mv %{buildroot}%{_bindir}/rdfpipe %{buildroot}%{_bindir}/rdfpipe-%{py3_ver} mv %{buildroot}%{_bindir}/rdfs2dot %{buildroot}%{_bindir}/rdfs2dot-%{py3_ver} ln -s %{_bindir}/csv2rdf-%{py3_ver} %{buildroot}%{_bindir}/csv2rdf ln -s %{_bindir}/rdf2dot-%{py3_ver} %{buildroot}%{_bindir}/rdf2dot -ln -s %{_bindir}/rdfgraphisomorpishm-%{py3_ver} %{buildroot}%{_bindir}/rdfgraphisomorpishm +ln -s %{_bindir}/rdfgraphisomorphism-%{py3_ver} %{buildroot}%{_bindir}/rdfgraphisomorphism ln -s %{_bindir}/rdfpipe-%{py3_ver} %{buildroot}%{_bindir}/rdfpipe ln -s %{_bindir}/rdfs2dot-%{py3_ver} %{buildroot}%{_bindir}/rdfs2dot @@ -92,7 +92,7 @@ --install %{_bindir}/rdfpipe rdfpipe %{_bindir}/rdfpipe-%{py3_ver} 30 \ --slave %{_bindir}/csv2rdf csv2rdf %{_bindir}/csv2rdf%{py3_ver} \ --slave %{_bindir}/rdf2dot rdf2dot %{_bindir}/rdf2dot%{py3_ver} \ - --slave %{_bindir}/rdfgraphisomorpishm rdfgraphisomorpishm %{_bindir}/rdfgraphisomorpishm%{py3_ver} \ + --slave %{_bindir}/rdfgraphisomorphism rdfgraphisomorphism %{_bindir}/rdfgraphisomorphism%{py3_ver} \ --slave %{_bindir}/rdfs2dot rdfs2dot %{_bindir}/rdfs2dot%{py3_ver} %preun @@ -108,12 +108,12 @@ %doc CHANGELOG.md LICENSE CONTRIBUTORS README.md docs/_build/html %{_bindir}/csv2rdf-%{py3_ver} %{_bindir}/rdf2dot-%{py3_ver} -%{_bindir}/rdfgraphisomorpishm-%{py3_ver} +%{_bindir}/rdfgraphisomorphism-%{py3_ver} %{_bindir}/rdfpipe-%{py3_ver} %{_bindir}/rdfs2dot-%{py3_ver} %ghost %{_bindir}/csv2rdf %ghost %{_bindir}/rdf2dot -%ghost %{_bindir}/rdfgraphisomorpishm +%ghost %{_bindir}/rdfgraphisomorphism %ghost %{_bindir}/rdfpipe %ghost %{_bindir}/rdfs2dot %{python3_sitelib}/rdflib/ ++++++ rdflib-4.0.1.tar.gz -> rdflib-4.1.2.tar.gz ++++++ ++++ 29329 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 docker for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2014-09-12 10:03:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2014-09-01 16:59:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2014-09-12 10:04:04.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 4 15:41:39 UTC 2014 - fcastelli(a)suse.com + +- Updates to SUSE's readme file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ README_SUSE.md ++++++ --- /var/tmp/diff_new_pack.AGLZft/_old 2014-09-12 10:04:06.000000000 +0200 +++ /var/tmp/diff_new_pack.AGLZft/_new 2014-09-12 10:04:06.000000000 +0200 @@ -106,19 +106,40 @@ ## Storage drivers -Docker images are made by series of stacked layers. The recommended driver is -DeviceMapper one, which is also the default choice. +Docker supports different storage drivers: -The Docker packages ships also an experimental BTRFS driver. To use this driver -Docker daemon must run on a BTRFS partition already prepared by the host system. - -To use the experimental BTRFS driver the Docker daemon must be started with this -command: + * `vfs`: this driver is automatically used when the Docker host filesystem + does not support copy-on-write. This is a simple driver which does not offer + some of the advantages of Docker (like sharing layers, more on that in the + next sections). It is highly reliable but also slow. + * `devicemapper`: this driver relies on the device-mapper thin provisioning + module. It supports copy-on-write, hence it offers all the advantages of + Docker. + * `btrfs`: this driver relies on Btrfs to provide all the features required + by Docker. To use this driver the `/var/lib/docker` directory must be on a + btrfs filesystem. + * `AUFS`: this driver relies on AUFS union filesystem. Neither the upstream + kernel nor the SUSE one supports this filesystem. Hence the AUFS driver is + not built into the SUSE Docker package. + +It is possible to specify which driver to use by changing the value of the +`DOCKER_OPTS` variable defined inside of the `/etc/sysconfig/docker` file. +This can be done either manually or using &yast; by browsing to: + * System + * /etc/sysconfig Editor + * System + * Management + * DOCKER_OPTS +menu and entering the `-s storage_driver` string. +For example, to force the usage of the `devicemapper` driver +enter the following text: ``` -docker -d -s btrfs +DOCKER_OPTS="-s devicemapper ``` +It is recommended to have `/var/lib/docker` mounted on a different filesystem +to not affect the Docker host OS in case of a filesystem corruption. # Setting up a Docker host -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmocka for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package cmocka for openSUSE:Factory checked in at 2014-09-12 10:03:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmocka (Old) and /work/SRC/openSUSE:Factory/.cmocka.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmocka" Changes: -------- --- /work/SRC/openSUSE:Factory/cmocka/cmocka.changes 2014-09-03 19:37:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmocka.new/cmocka.changes 2014-09-12 10:04:03.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Sep 11 15:03:12 UTC 2014 - asn(a)cryptomilk.org + +- Update to version 0.4.1 + * Added CMOCKA_TEST_ABORT env variable to leave threading apps. + * Fixed count parameter of expect_check() macro. + * Fixed reporting the number of tests. + * Fixed cmake config files. + +------------------------------------------------------------------- @@ -4,0 +14,5 @@ + +------------------------------------------------------------------- +Tue Aug 26 13:23:43 UTC 2014 - asn(a)cryptomilk.org + +- Add BuildRequire for pkg-config. Old: ---- cmocka-0.4.0.tar.xz New: ---- cmocka-0.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmocka.spec ++++++ --- /var/tmp/diff_new_pack.mG1bE0/_old 2014-09-12 10:04:04.000000000 +0200 +++ /var/tmp/diff_new_pack.mG1bE0/_new 2014-09-12 10:04:04.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: pkg-config Name: cmocka -Version: 0.4.0 +Version: 0.4.1 Release: 0 # Summary: Lightweight library to simplify and generalize unit tests for C @@ -143,8 +143,9 @@ %{_includedir}/cmocka.h %{_libdir}/libcmocka.so %{_libdir}/pkgconfig/cmocka.pc -%{_libdir}/cmake/cmocka-config-version.cmake -%{_libdir}/cmake/cmocka-config.cmake +%dir %{_libdir}/cmake/cmocka +%{_libdir}/cmake/cmocka/cmocka-config-version.cmake +%{_libdir}/cmake/cmocka/cmocka-config.cmake %files -n libcmocka-devel-static %defattr(-,root,root) ++++++ cmocka-0.4.0.tar.xz -> cmocka-0.4.1.tar.xz ++++++ Files old/cmocka-0.4.0/.ycm_extra_conf.pyc and new/cmocka-0.4.1/.ycm_extra_conf.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/CMakeLists.txt new/cmocka-0.4.1/CMakeLists.txt --- old/cmocka-0.4.0/CMakeLists.txt 2014-04-11 15:43:46.000000000 +0200 +++ new/cmocka-0.4.1/CMakeLists.txt 2014-05-22 14:40:29.000000000 +0200 @@ -8,7 +8,7 @@ set(APPLICATION_VERSION_MAJOR "0") set(APPLICATION_VERSION_MINOR "4") -set(APPLICATION_VERSION_PATCH "0") +set(APPLICATION_VERSION_PATCH "1") set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") @@ -19,7 +19,7 @@ # Increment AGE. Set REVISION to 0 # If the source code was changed, but there were no interface changes: # Increment REVISION. -set(LIBRARY_VERSION "0.2.0") +set(LIBRARY_VERSION "0.2.1") set(LIBRARY_SOVERSION "0") # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked @@ -67,14 +67,16 @@ ) # cmake config files -configure_file(cmocka-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmocka-config.cmake @ONLY) -configure_file(cmocka-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmocka-config-version.cmake @ONLY) +set(CMOCKA_LIBRARY_NAME @CMAKE_SHARED_LIBRARY_PREFIX@${PROJECT_NAME}@CMAKE_SHARED_LIBRARY_SUFFIX@) + +configure_file(${PROJECT_NAME}-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake @ONLY) +configure_file(${PROJECT_NAME}-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake @ONLY) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/cmocka-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/cmocka-config-version.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake DESTINATION - ${CMAKE_INSTALL_DIR} + ${CMAKE_INSTALL_DIR}/${PROJECT_NAME} COMPONENT devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/CPackConfig.cmake new/cmocka-0.4.1/CPackConfig.cmake --- old/cmocka-0.4.0/CPackConfig.cmake 2013-11-06 08:12:58.000000000 +0100 +++ new/cmocka-0.4.1/CPackConfig.cmake 2014-04-14 09:23:21.000000000 +0200 @@ -19,7 +19,7 @@ ### source generator set(CPACK_SOURCE_GENERATOR "TGZ") -set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj/;tags;cscope.*") +set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj/;tags;cscope.*;.ycm_extra_conf.pyc") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") if (WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/ChangeLog new/cmocka-0.4.1/ChangeLog --- old/cmocka-0.4.0/ChangeLog 2014-04-11 15:43:46.000000000 +0200 +++ new/cmocka-0.4.1/ChangeLog 2014-05-22 14:40:05.000000000 +0200 @@ -1,3 +1,10 @@ +Thu May 22 2014 Andreas Schneider <asn(a)cryptomilk.org> + * cmocka: version 0.4.1 + * Added CMOCKA_TEST_ABORT env variable to leave threading apps. + * Fixed count parameter of expect_check() macro. + * Fixed reporting the number of tests. + * Fixed cmake config files. + Fri Apr 11 2014 Andreas Schneider <asn(a)cryptomilk.org> * cmocka: version 0.4.0 * Added support for group testing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/cmocka-config.cmake.in new/cmocka-0.4.1/cmocka-config.cmake.in --- old/cmocka-0.4.0/cmocka-config.cmake.in 2014-01-22 16:10:30.000000000 +0100 +++ new/cmocka-0.4.1/cmocka-config.cmake.in 2014-05-22 14:19:53.000000000 +0200 @@ -7,5 +7,5 @@ set(CMOCKA_INCLUDE_DIR @INCLUDE_INSTALL_DIR@) endif() -set(CMOCKA_LIRBARY @LIB_INSTALL_DIR@/cmocka.so) -set(CMOCKA_LIRBARIES @LIB_INSTALL_DIR@/cmocka.so) +set(CMOCKA_LIBRARY @LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@) +set(CMOCKA_LIBRARIES @LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/coverity/coverity_assert_model.c new/cmocka-0.4.1/coverity/coverity_assert_model.c --- old/cmocka-0.4.0/coverity/coverity_assert_model.c 2013-07-29 19:40:12.000000000 +0200 +++ new/cmocka-0.4.1/coverity/coverity_assert_model.c 2014-04-14 21:37:54.000000000 +0200 @@ -21,6 +21,16 @@ __coverity_panic__(); } +void _assert_return_code(const LargestIntegralType result, + size_t rlen, + const LargestIntegralType error, + const char * const expression, + const char * const file, + const int line) +{ + __coverity_panic__(); +} + void _assert_string_equal(const char * const a, const char * const b, const char * const file, const int line) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/doc/mainpage.dox new/cmocka-0.4.1/doc/mainpage.dox --- old/cmocka-0.4.0/doc/mainpage.dox 2013-12-19 18:03:57.000000000 +0100 +++ new/cmocka-0.4.1/doc/mainpage.dox 2014-04-15 17:01:10.000000000 +0200 @@ -82,4 +82,18 @@ <a href="https://lwn.net/Articles/558106/">Learn more ...</a> +@section main-threads Threading + +cmocka is not thread safe and it is not the goal of it to be it. However if +you use cmocka for writing tests in an application which uses threads, you +can set the following envionment variable: + +<pre> + CMOCKA_TEST_ABORT='1' ./my_threading_test +</pre> + +With this environment variable set to '1', cmocka will call <tt>abort()</tt> if +a test fails. Else it is likely that you will run into deadlocks with mutexes +or other funny errors. + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/include/cmocka.h new/cmocka-0.4.1/include/cmocka.h --- old/cmocka-0.4.0/include/cmocka.h 2014-04-11 15:43:46.000000000 +0200 +++ new/cmocka-0.4.1/include/cmocka.h 2014-05-20 11:03:36.000000000 +0200 @@ -389,7 +389,7 @@ #else #define expect_check(function, parameter, check_function, check_data) \ _expect_check(#function, #parameter, __FILE__, __LINE__, check_function, \ - cast_to_largest_integral_type(check_data), NULL, 0) + cast_to_largest_integral_type(check_data), NULL, 1) #endif #ifdef DOXYGEN @@ -1294,6 +1294,17 @@ #ifdef DOXYGEN /** * @brief Forces the test to fail immediately and quit, printing the reason. + * + * @code + * fail_msg("This is some error message for test"); + * @endcode + * + * or + * + * @code + * char *error_msg = "This is some error message for test"; + * fail_msg("%s", error_msg); + * @endcode */ void fail_msg(const char *msg, ...); #else @@ -1351,9 +1362,11 @@ unit_test(test), \ _unit_test_teardown(test, teardown) +/** Initializes a UnitTest structure for a group setup function. */ #define group_test_setup(setup) \ { "group_" #setup, setup, UNIT_TEST_FUNCTION_TYPE_GROUP_SETUP } +/** Initializes a UnitTest structure for a group teardown function. */ #define group_test_teardown(teardown) \ { "group_" #teardown, teardown, UNIT_TEST_FUNCTION_TYPE_GROUP_TEARDOWN } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmocka-0.4.0/src/cmocka.c new/cmocka-0.4.1/src/cmocka.c --- old/cmocka-0.4.0/src/cmocka.c 2014-04-11 15:09:35.000000000 +0200 +++ new/cmocka-0.4.1/src/cmocka.c 2014-04-15 17:22:30.000000000 +0200 @@ -297,8 +297,13 @@ /* Exit the currently executing test. */ -static void exit_test(const int quit_application) { - if (global_running_test) { +static void exit_test(const int quit_application) +{ + const char *abort_test = getenv("CMOCKA_TEST_ABORT"); + + if (abort_test != NULL && abort_test[0] == '1') { + abort(); + } else if (global_running_test) { longjmp(global_run_test_env, 1); } else if (quit_application) { exit(-1); @@ -1778,19 +1783,35 @@ size_t setups = 0; /* Number of teardown functions. */ size_t teardowns = 0; + size_t i; /* * A stack of test states. A state is pushed on the stack * when a test setup occurs and popped on tear down. */ TestState* test_states = (TestState*)malloc(number_of_tests * sizeof(*test_states)); - size_t number_of_test_states = 0; + /* The number of test states which should be 0 at the end */ + long number_of_test_states = 0; /* Names of the tests that failed. */ const char** failed_names = (const char**)malloc(number_of_tests * sizeof(*failed_names)); void **current_state = NULL; - print_message("[==========] Running %"PRIdS " test(s).\n", number_of_tests); + /* Count setup and teardown functions */ + for (i = 0; i < number_of_tests; i++) { + const UnitTest * const test = &tests[i]; + + if (test->function_type == UNIT_TEST_FUNCTION_TYPE_SETUP) { + setups++; + } + + if (test->function_type == UNIT_TEST_FUNCTION_TYPE_TEARDOWN) { + teardowns++; + } + } + + print_message("[==========] Running %"PRIdS " test(s).\n", + number_of_tests - setups - teardowns); /* Make sure LargestIntegralType is at least the size of a pointer. */ assert_true(sizeof(LargestIntegralType) >= sizeof(void*)); @@ -1817,7 +1838,6 @@ current_state = &current_TestState->state; *current_state = NULL; run_next_test = 1; - setups ++; break; } case UNIT_TEST_FUNCTION_TYPE_TEARDOWN: @@ -1826,7 +1846,6 @@ current_TestState = &test_states[--number_of_test_states]; test_check_point = current_TestState->check_point; current_state = &current_TestState->state; - teardowns ++; break; default: print_error("Invalid unit test function type %d\n", @@ -1878,8 +1897,7 @@ print_message("[==========] %"PRIdS " test(s) run.\n", tests_executed); print_error("[ PASSED ] %"PRIdS " test(s).\n", tests_executed - total_failed); - if (total_failed) { - size_t i; + if (total_failed > 0) { print_error("[ FAILED ] %"PRIdS " test(s), listed below:\n", total_failed); for (i = 0; i < total_failed; i++) { print_error("[ FAILED ] %s\n", failed_names[i]); @@ -1888,7 +1906,7 @@ print_error("\n %"PRIdS " FAILED TEST(S)\n", total_failed); } - if (number_of_test_states) { + if (number_of_test_states != 0) { print_error("[ ERROR ] Mismatched number of setup %"PRIdS " and " "teardown %"PRIdS " functions\n", setups, teardowns); total_failed = (size_t)-1; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-requests for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package python3-requests for openSUSE:Factory checked in at 2014-09-12 10:03:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-requests (Old) and /work/SRC/openSUSE:Factory/.python3-requests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-requests" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-requests/python3-requests.changes 2014-07-17 06:58:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-requests.new/python3-requests.changes 2014-09-12 10:04:02.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Sep 11 12:34:42 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 2.4.1 (2014-09-09) + - Now has a "security" package extras set, + ``$ pip install requests[security]`` + - Requests will now use Certifi if it is available. + - Capture and re-raise urllib3 ProtocolError + - Bugfix for responses that attempt to redirect to themselves + forever (wtf?). +- Update to 2.4.0 (2014-08-29) + * Behavioral Changes + - ``Connection: keep-alive`` header is now sent automatically. + * Improvements + - Support for connect timeouts! Timeout now accepts a tuple + (connect, read) which is used to set individual connect and + read timeouts. + - Allow copying of PreparedRequests without headers/cookies. + - Updated bundled urllib3 version. + - Refactored settings loading from environment + new `Session.merge_environment_settings`. + - Handle socket errors in iter_content. + +------------------------------------------------------------------- Old: ---- requests-2.3.0.tar.gz New: ---- requests-2.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-requests.spec ++++++ --- /var/tmp/diff_new_pack.mj7Q2O/_old 2014-09-12 10:04:03.000000000 +0200 +++ /var/tmp/diff_new_pack.mj7Q2O/_new 2014-09-12 10:04:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-requests -Version: 2.3.0 +Version: 2.4.1 Release: 0 Url: http://python-requests.org Summary: Awesome Python HTTP Library That's Actually Usable @@ -31,7 +31,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: python3-py BuildRequires: python3-setuptools +Requires: python3-py BuildArch: noarch %description ++++++ no-default-cacert-sles.patch ++++++ --- /var/tmp/diff_new_pack.mj7Q2O/_old 2014-09-12 10:04:03.000000000 +0200 +++ /var/tmp/diff_new_pack.mj7Q2O/_new 2014-09-12 10:04:03.000000000 +0200 @@ -23,12 +23,12 @@ =================================================================== --- requests-1.1.0.orig/requests/certs.py +++ requests-1.1.0/requests/certs.py -@@ -18,7 +18,7 @@ def where(): - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return None +@@ -19,7 +19,7 @@ + def where(): + """Return the preferred certificate bundle.""" + # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ return None if __name__ == '__main__': print(where()) ++++++ no-default-cacert.patch ++++++ --- /var/tmp/diff_new_pack.mj7Q2O/_old 2014-09-12 10:04:03.000000000 +0200 +++ /var/tmp/diff_new_pack.mj7Q2O/_new 2014-09-12 10:04:03.000000000 +0200 @@ -12,12 +12,12 @@ else: --- a/requests/certs.py +++ b/requests/certs.py -@@ -18,7 +18,7 @@ - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return '/etc/ssl/certs/' +@@ -19,7 +19,7 @@ + def where(): + """Return the preferred certificate bundle.""" + # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ return '/etc/ssl/certs/' if __name__ == '__main__': print(where()) @@ -26,3 +26,4 @@ @@ -1 +1 @@ -include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem +include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt + ++++++ requests-2.3.0.tar.gz -> requests-2.4.1.tar.gz ++++++ ++++ 3858 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 python-requests for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package python-requests for openSUSE:Factory checked in at 2014-09-12 10:03:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-requests (Old) and /work/SRC/openSUSE:Factory/.python-requests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-requests" Changes: -------- --- /work/SRC/openSUSE:Factory/python-requests/python-requests.changes 2014-06-16 21:32:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-requests.new/python-requests.changes 2014-09-12 10:04:00.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Sep 11 12:34:42 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 2.4.1 (2014-09-09) + - Now has a "security" package extras set, + ``$ pip install requests[security]`` + - Requests will now use Certifi if it is available. + - Capture and re-raise urllib3 ProtocolError + - Bugfix for responses that attempt to redirect to themselves + forever (wtf?). +- Update to 2.4.0 (2014-08-29) + * Behavioral Changes + - ``Connection: keep-alive`` header is now sent automatically. + * Improvements + - Support for connect timeouts! Timeout now accepts a tuple + (connect, read) which is used to set individual connect and + read timeouts. + - Allow copying of PreparedRequests without headers/cookies. + - Updated bundled urllib3 version. + - Refactored settings loading from environment + new `Session.merge_environment_settings`. + - Handle socket errors in iter_content. + +------------------------------------------------------------------- Old: ---- requests-2.3.0.tar.gz New: ---- requests-2.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-requests.spec ++++++ --- /var/tmp/diff_new_pack.AVrefy/_old 2014-09-12 10:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.AVrefy/_new 2014-09-12 10:04:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-requests -Version: 2.3.0 +Version: 2.4.1 Release: 0 Url: http://python-requests.org Summary: Awesome Python HTTP Library That's Actually Usable @@ -32,7 +32,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python BuildRequires: python-devel +BuildRequires: python-py BuildRequires: python-setuptools +Requires: python-py Requires: python %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ no-default-cacert-sles.patch ++++++ --- /var/tmp/diff_new_pack.AVrefy/_old 2014-09-12 10:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.AVrefy/_new 2014-09-12 10:04:02.000000000 +0200 @@ -23,12 +23,12 @@ =================================================================== --- requests-1.1.0.orig/requests/certs.py +++ requests-1.1.0/requests/certs.py -@@ -18,7 +18,7 @@ def where(): - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return None +@@ -19,7 +19,7 @@ + def where(): + """Return the preferred certificate bundle.""" + # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ return None if __name__ == '__main__': print(where()) ++++++ no-default-cacert.patch ++++++ --- /var/tmp/diff_new_pack.AVrefy/_old 2014-09-12 10:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.AVrefy/_new 2014-09-12 10:04:02.000000000 +0200 @@ -12,12 +12,12 @@ else: --- a/requests/certs.py +++ b/requests/certs.py -@@ -18,7 +18,7 @@ - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return '/etc/ssl/certs/' +@@ -19,7 +19,7 @@ + def where(): + """Return the preferred certificate bundle.""" + # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ return '/etc/ssl/certs/' if __name__ == '__main__': print(where()) @@ -26,3 +26,4 @@ @@ -1 +1 @@ -include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem +include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt + ++++++ requests-2.3.0.tar.gz -> requests-2.4.1.tar.gz ++++++ ++++ 3858 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 icinga for openSUSE:Factory
by root＠hilbert.suse.de 12 Sep '14

12 Sep '14

Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2014-09-12 10:03:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icinga" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2014-09-03 20:00:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2014-09-12 10:03:58.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 3 12:47:59 UTC 2014 - thardeck(a)suse.com + +- update to upstream version 1.11.7 + * Use versioned dependencies in the RPM spec file #7071 - GB + * Import 1.11.7 schema changes from Icinga 2 #6939 - MF + * New programstatus column 'endpoint_name' requires schema update to 1.11.7! #6939 + +------------------------------------------------------------------- Old: ---- icinga-1.11.6.tar.gz New: ---- icinga-1.11.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.5xIb71/_old 2014-09-12 10:04:00.000000000 +0200 +++ /var/tmp/diff_new_pack.5xIb71/_new 2014-09-12 10:04:00.000000000 +0200 @@ -23,7 +23,7 @@ %endif Name: icinga -Version: 1.11.6 +Version: 1.11.7 Release: 0 Summary: Host/service/network monitoring program @@ -133,7 +133,7 @@ Group: System/Monitoring Provides: %{name}-classicui Provides: monitoring_webfrontend -Requires: %{name}-classicui-config +Requires: %{name}-classicui-config = %{version} Requires: %{name}-doc = %{version} Requires(pre): apache2 ++++++ icinga-1.11.6.tar.gz -> icinga-1.11.7.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/icinga-1.11.6.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/icinga-1.11.7.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0