Hello community, here is the log from the commit of package dice for openSUSE:Factory checked in at 2015-05-18 22:28:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dice (Old) and /work/SRC/openSUSE:Factory/.dice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dice" Changes: -------- --- /work/SRC/openSUSE:Factory/dice/dice.changes 2015-04-12 00:10:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dice.new/dice.changes 2015-05-18 22:28:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 17 21:10:22 CEST 2015 - m...@suse.de + +- Switched to gem2rpm way of creating the package + +------------------------------------------------------------------- New: ---- gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dice.spec ++++++ --- /var/tmp/diff_new_pack.IKJo8s/_old 2015-05-18 22:28:29.000000000 +0200 +++ /var/tmp/diff_new_pack.IKJo8s/_new 2015-05-18 22:28:29.000000000 +0200 @@ -21,45 +21,32 @@ Release: 0 %define mod_name dice %define mod_full_name %{mod_name}-%{version} -%define mod_branch -%{version} -%define mod_weight 1 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: ruby-devel -BuildRequires: ruby-macros >= 1 -%if %suse_version == 1315 %define rb_build_versions %{rb_default_ruby} -BuildRequires: %{rubydevel} +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{rubygem abstract_method >= 1.2.1} BuildRequires: %{rubygem bundler} BuildRequires: %{rubygem cheetah >= 0.4.0} BuildRequires: %{rubygem gem2rpm} -BuildRequires: %{rubygem gli <= 2.12} BuildRequires: %{rubygem gli >= 2.11.0} BuildRequires: %{rubygem inifile >= 2.0.2} BuildRequires: %{rubygem json >= 1.8.0} BuildRequires: %{rubygem rice} -%else -BuildRequires: rubygem(abstract_method) >= 1.2.1 -BuildRequires: rubygem(bundler) -BuildRequires: rubygem(cheetah) >= 0.4.0 -BuildRequires: rubygem(gem2rpm) -BuildRequires: rubygem(gli) <= 2.12 -BuildRequires: rubygem(gli) >= 2.11.0 -BuildRequires: rubygem(inifile) >= 2.0.2 -BuildRequires: rubygem(json) >= 1.8.0 -BuildRequires: rubygem(rice) -%endif +BuildRequires: %{ruby} +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: ruby-devel +BuildRequires: ruby-macros >= 5 +BuildRequires: update-alternatives + # Disable autogenerating "Requires:" headers for bundled gems. %define __requires_exclude ^rubygem Requires: ruby >= 2.0 Requires: ruby-solv -Url: http://suse.com +Url: http://www.suse.com Source0: %{mod_full_name}.gem Source1: %{mod_name}-rpmlintrc -Summary: light weight image build system +Source2: gem2rpm.yml +Summary: Light Weight Image Build System License: GPL-3.0 Group: Development/Languages/Ruby @@ -72,35 +59,27 @@ the software packages has changed. With Dice there is a tool which automatically builds all appliances stored in a directory -%package doc -Summary: RDoc and RI documentation for Machinery -Group: Development/Languages/Ruby -Requires: %{name} = %{version} - -%description doc -RDoc and RI documentation for dice is a light weight image build system for kiwi - %prep %build %install +# Install the Ruby source +%gem_install \ + --symlink-binaries \ + --doc-files="COPYING recipes key" \ + -f -# Install the gem itself - -%gem_install -f - +# Change to ruby gem dir pushd %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name} # Build CPP extensions - ( cd lib/semaphore && ruby ./extconf.rb && make && rm -f semaphore.o ) # Bundle dependencies - cat > Gemfile <<EOT gem "cheetah", ">= 0.4.0" -gem "gli", "~> 2.11.0" +gem "gli", ">= 2.11.0" gem "abstract_method", ">= 1.2.1" %if %suse_version <= 1310 gem "json", ">= 1.8.0" @@ -115,8 +94,6 @@ rm -rf vendor .bundle Gemfile Gemfile.lock -popd - # Adapt the binary # Here we do a surgery on the binary to actually load the bundled gems. This is @@ -125,34 +102,21 @@ sed -i '/gem/i \ Gem.path.unshift("%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/bundle/ruby/%{rb_ver}") -' %{buildroot}%{_bindir}/%{mod_name} +' bin/%{mod_name} -# Additional files +# Delete devel source +( cd lib/semaphore && rm -f semaphore.cpp Makefile extconf.rb ) +# Move bash completion mkdir -p %{buildroot}/etc/bash_completion.d -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/COPYING -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/recipes -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/key -ln -s %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/completion/dice.sh \ - %{buildroot}/etc/bash_completion.d/dice.sh +mv completion/dice.sh %{buildroot}/etc/bash_completion.d -# Convert duplicate files to symlinks +popd +# Convert duplicate files to symlinks %fdupes -s %{buildroot} -%files -%defattr(-,root,root,-) -%{_bindir}/%{mod_name} -%{_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 +%gem_packages %config /etc/bash_completion.d/dice.sh -%doc COPYING -%doc recipes -%doc key - -%files doc -%defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ %changelog ++++++ dice-0.5.3.gem ++++++ Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-04-10 12:38:00.000000000 +0200 +++ new/metadata 1970-01-01 01:00:00.000000000 +0100 @@ -8,104 +8,104 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-04-10 00:00:00.000000000 Z +date: 2015-05-17 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: cheetah requirement: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 0.4.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 0.4.0 - !ruby/object:Gem::Dependency name: gli requirement: !ruby/object:Gem::Requirement requirements: - - - "~>" + - - '>=' - !ruby/object:Gem::Version version: 2.11.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - "~>" + - - '>=' - !ruby/object:Gem::Version version: 2.11.0 - !ruby/object:Gem::Dependency name: abstract_method requirement: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 1.2.1 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 1.2.1 - !ruby/object:Gem::Dependency name: json requirement: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 1.8.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 1.8.0 - !ruby/object:Gem::Dependency name: inifile requirement: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 2.0.2 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 2.0.2 - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: '0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: '0' - !ruby/object:Gem::Dependency name: packaging_rake_tasks requirement: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: '0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: '0' description: "\n Given there is the need to build a kiwi appliance for a customer,\n @@ -122,63 +122,63 @@ extensions: [] extra_rdoc_files: [] files: -- COPYING -- bin/dice -- completion/dice.sh -- key/vagrant -- lib/build_scheduler.rb -- lib/build_status.rb +- lib/connection_vagrant_build_system.rb +- lib/repository_plaindir.rb +- lib/kiwi_config.rb +- lib/dice_options.rb - lib/build_system.rb +- lib/build_scheduler.rb +- lib/uri.rb +- lib/repository_suse.rb - lib/build_system_base.rb -- lib/build_task.rb +- lib/connection_host_build_system.rb - lib/cleaner.rb -- lib/cli.rb -- lib/colorstring.rb -- lib/config.rb -- lib/connection.rb +- lib/dice_logger.rb +- lib/repository_base.rb - lib/connection_base.rb -- lib/connection_host_build_system.rb +- lib/build_status.rb +- lib/host_build_system.rb +- lib/exceptions.rb - lib/connection_task.rb -- lib/connection_vagrant_build_system.rb -- lib/constants.rb +- lib/cli.rb +- lib/logger.rb - lib/dice.rb -- lib/dice_logger.rb -- lib/dice_options.rb -- lib/exceptions.rb -- lib/host_build_system.rb -- lib/job.rb -- lib/kiwi_config.rb - lib/kiwi_uri.rb -- lib/logger.rb +- lib/run_command.rb +- lib/config.rb +- lib/version.rb - lib/recipe.rb -- lib/repository.rb -- lib/repository_base.rb -- lib/repository_plaindir.rb +- lib/connection.rb +- lib/build_task.rb - lib/repository_rpmmd.rb -- lib/repository_suse.rb -- lib/run_command.rb +- lib/vagrant_build_system.rb +- lib/constants.rb - lib/semaphore/extconf.rb -- lib/semaphore/semaphore.cpp +- lib/job.rb +- lib/colorstring.rb - lib/solver.rb -- lib/uri.rb -- lib/vagrant_build_system.rb -- lib/version.rb -- recipes/suse-13.1-JeOS/Dicefile -- recipes/suse-13.1-JeOS/Vagrantfile -- recipes/suse-13.1-JeOS/config.sh -- recipes/suse-13.1-JeOS/config.xml -- recipes/suse-13.1-JeOS/root/etc/motd -- recipes/suse-13.2-JeOS/Dicefile -- recipes/suse-13.2-JeOS/config.sh -- recipes/suse-13.2-JeOS/config.xml +- lib/repository.rb +- lib/semaphore/semaphore.cpp +- bin/dice +- completion/dice.sh +- key/vagrant - recipes/suse-13.2-JeOS/root/etc/motd -- recipes/suse-SLE12-JeOS/Dicefile +- recipes/suse-13.2-JeOS/config.xml +- recipes/suse-13.2-JeOS/config.sh +- recipes/suse-13.2-JeOS/Dicefile - recipes/suse-SLE12-JeOS/Vagrantfile -- recipes/suse-SLE12-JeOS/config.sh -- recipes/suse-SLE12-JeOS/config.xml -- recipes/suse-SLE12-JeOS/root/etc/motd -- recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0 - recipes/suse-SLE12-JeOS/root/etc/udev/rules.d/70-persistent-net.rules +- recipes/suse-SLE12-JeOS/root/etc/sysconfig/network/ifcfg-lan0 +- recipes/suse-SLE12-JeOS/root/etc/motd +- recipes/suse-SLE12-JeOS/config.xml +- recipes/suse-SLE12-JeOS/config.sh +- recipes/suse-SLE12-JeOS/Dicefile +- recipes/suse-13.1-JeOS/Vagrantfile +- recipes/suse-13.1-JeOS/root/etc/motd +- recipes/suse-13.1-JeOS/config.xml +- recipes/suse-13.1-JeOS/config.sh +- recipes/suse-13.1-JeOS/Dicefile +- COPYING homepage: https://github.com/schaefi/dice/ licenses: - GPL-3.0 @@ -189,17 +189,17 @@ - lib required_ruby_version: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: '0' required_rubygems_version: !ruby/object:Gem::Requirement requirements: - - - ">=" + - - '>=' - !ruby/object:Gem::Version version: 1.3.6 requirements: [] rubyforge_project: dice -rubygems_version: 2.2.2 +rubygems_version: 2.0.3 signing_key: specification_version: 4 summary: light weight image build system ++++++ 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 #