Hello community, here is the log from the commit of package rubygem-packaging_rake_tasks for openSUSE:Factory checked in at 2014-10-11 19:25:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-packaging_rake_tasks (Old) and /work/SRC/openSUSE:Factory/.rubygem-packaging_rake_tasks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-packaging_rake_tasks" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-packaging_rake_tasks/rubygem-packaging_rake_tasks.changes 2014-02-28 17:46:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-packaging_rake_tasks.new/rubygem-packaging_rake_tasks.changes 2014-10-11 19:25:58.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Oct 6 09:26:08 UTC 2014 - jreidinger@suse.com + +- Add configuration option for maintenance mode, which allows to + create maintenance requests instead of pull requests +- use new ruby packaging schema for rpm spec +- 1.1.0 + +------------------------------------------------------------------- +Wed Apr 23 11:52:39 UTC 2014 - mvidner@suse.com + +- Always pass the conf.obs_api parameter so that osc does not + ask about a login to api.opensuse.org. +- 1.0.16 + +------------------------------------------------------------------- Old: ---- packaging_rake_tasks-1.0.15.gem New: ---- packaging_rake_tasks-1.1.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-packaging_rake_tasks.spec ++++++ --- /var/tmp/diff_new_pack.MPxMwx/_old 2014-10-11 19:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.MPxMwx/_new 2014-10-11 19:25:59.000000000 +0200 @@ -17,47 +17,53 @@ Name: rubygem-packaging_rake_tasks -Version: 1.0.15 +Version: 1.1.0 Release: 0 - -# Nope, doesn't work. Gems are installed below /usr/lib{64} -# BuildArch: noarch - %define mod_name packaging_rake_tasks -# +%define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: rubygems_with_buildroot_patch -Requires: rubygems >= 1.2.0 - -BuildRequires: rubygem-rake -Requires: rubygem-rake - -Url: https://github.com/openSUSE/packaging_tasks -Source: %{mod_name}-%{version}.gem - -Summary: Rake tasks shared by all YaST webservice packages +BuildRequires: ruby-macros >= 3 +Url: http://github.org/openSUSE/packaging_tasks +Source: http://rubygems.org/gems/%{mod_full_name}.gem +Summary: Rake tasks providing tasks to package project in git and integration License: LGPL-2.1 Group: Development/Languages/Ruby %description -The original task package is renamed to package-local. -The new task package includes the tasks git_check and syntax_check. +Rake tasks to allow easy packaging ruby projects in git for Build Service or +other packaging service. + +%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 +#if you need patches, apply them here and replace the # with a % sign in the surrounding lines +#gem_build + %build -%install -%gem_install %{S:0} -%clean -%{__rm} -rf %{buildroot} +%install +%gem_install -f +mkdir -p %{buildroot}%{_docdir}/%{name} +ln -s %{gem_base}/gems/%{mod_full_name}/COPYING %buildroot/%{_docdir}/%{name}/COPYING %files %defattr(-,root,root,-) -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_name}-%{version}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/ -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/ -%doc %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/COPYING +%{_docdir}/%{name} +%{gem_base}/cache/%{mod_full_name}.gem +%{gem_base}/gems/%{mod_full_name}/ +%{gem_base}/specifications/%{mod_full_name}.gemspec + +%files doc +%defattr(-,root,root,-) +%doc %{gem_base}/doc %changelog ++++++ packaging_rake_tasks-1.0.15.gem -> packaging_rake_tasks-1.1.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION --- old/VERSION 1970-01-01 01:00:00.000000000 +0100 +++ new/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +1 @@ -1.0.15 +1.1.0 Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/packaging/configuration.rb new/lib/packaging/configuration.rb --- old/lib/packaging/configuration.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/packaging/configuration.rb 1970-01-01 01:00:00.000000000 +0100 @@ -29,6 +29,7 @@ @obs_api = "https://api.opensuse.org/" @obs_target = "openSUSE_Factory" @skip_license_check = [] + @maintenance_mode = false end #custom package name, by default directory name @@ -55,6 +56,8 @@ attr_accessor :obs_target # additional list of regex to skip license check attr_accessor :skip_license_check + # Specify if project is in maintenance mode. If so, then it create maintenance request instead of pull request + attr_accessor :maintenance_mode def package_name @package_name ||= Dir.pwd.split("/").last diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/osc.rake new/lib/tasks/osc.rake --- old/lib/tasks/osc.rake 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/tasks/osc.rake 1970-01-01 01:00:00.000000000 +0100 @@ -69,7 +69,7 @@ end Dir.chdir(osc_checkout_dir) do - sh "osc addremove" + sh "osc -A '#{obs_api}' addremove" end end @@ -97,7 +97,7 @@ puts "building package..." if verbose # pipe yes to osc build to automatic rebuild broken build root if it happen - command = "yes | osc build" + command = "yes | osc -A '#{obs_api}' build" command << " --no-verify" #ignore untrusted BS projects command << " --release=1" #have always same release number # have separated roots per target system, so sharing is more effficient @@ -127,7 +127,7 @@ # If a line starts with +, delete + and print it. # Except skip the added "-----" header and the timestamp-author after that, # and skip the +++ diff header - changes = `osc diff *.changes | sed -n '/^+---/,+2b;/^+++/b;s/^+//;T;p'`.strip + changes = `osc -A '#{obs_api}' diff *.changes | sed -n '/^+---/,+2b;/^+++/b;s/^+//;T;p'`.strip if changes.empty? # %h is short hash of a commit git_ref = `git log --format=%h -n 1`.chomp @@ -137,7 +137,7 @@ # provide only reasonable amount of changes changes = changes.split("\n").take(MAX_CHANGES_LINES).join("\n") - sh "osc", "commit", "-m", changes + sh "osc", "-A", obs_api, "commit", "-m", changes puts "New package submitted to #{obs_project}" if verbose end ensure @@ -171,7 +171,11 @@ desc "Create submit request from devel project to target project without any other packaging or checking" task :force do new_version = version_from_spec("#{package_dir}/#{package_name}.spec") - sh "yes | osc -A '#{obs_api}' sr '#{obs_project}' '#{package_name}' '#{obs_sr_project}' -m 'submit new version #{new_version}' --yes" + if Packaging::Configuration.instance.maintenance_mode + sh "yes | osc -A '#{obs_api}' maintenancerequest --no-cleanup '#{obs_project}' '#{package_name}' '#{obs_sr_project}' -m 'submit new version #{new_version}'" + else + sh "yes | osc -A '#{obs_api}' submitreq --no-cleanup '#{obs_project}' '#{package_name}' '#{obs_sr_project}' -m 'submit new version #{new_version}' --yes" + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 1970-01-01 01:00:00.000000000 +0100 +++ new/metadata 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: packaging_rake_tasks version: !ruby/object:Gem::Version - version: 1.0.15 + version: 1.1.0 platform: ruby authors: - Josef Reidinger autorequire: bindir: bin cert_chain: [] -date: 2014-02-26 00:00:00.000000000 Z +date: 2014-10-08 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org