diff --git a/rubygem-gem2rpm.changes b/rubygem-gem2rpm.changes index cd43449..0eb173d 100644 --- a/rubygem-gem2rpm.changes +++ b/rubygem-gem2rpm.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Sep 8 11:02:50 UTC 2014 - mrueckert@suse.de + +- changed rubinius macro + +------------------------------------------------------------------- +Fri Sep 5 09:46:22 UTC 2014 - mrueckert@suse.de + +- for easier bootstrapping dont use gem2rpm here for now. + +------------------------------------------------------------------- +Thu Sep 4 13:34:30 UTC 2014 - mrueckert@suse.de + +- make it easier to enable rbx and ruby 2.2 support + +------------------------------------------------------------------- +Wed Sep 3 12:44:54 UTC 2014 - mrueckert@suse.de + +- added support for building for rbx + +------------------------------------------------------------------- +Mon Jul 28 11:11:27 UTC 2014 - mrueckert@suse.de + +- really install the templates as docs + ------------------------------------------------------------------- Thu Jul 24 15:30:14 UTC 2014 - mrueckert@suse.de @@ -47,6 +72,9 @@ Wed Jul 23 09:06:02 UTC 2014 - mrueckert@suse.de ------------------------------------------------------------------- Mon Jul 21 11:32:38 UTC 2014 - mrueckert@suse.de +- 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 - renamed gem2rpm.yml to gem2rpm.yml.documentation: this is just documentation and not the gem2rpm.yml that gem2rpm should pick up. @@ -56,6 +84,7 @@ Mon Jul 21 09:23:55 UTC 2014 - mrueckert@suse.de - added gem2rpm-0.9.2_sles12_template.patch: initial template for sle12 ruby packaging +- only build for 2.1 for now ------------------------------------------------------------------- Tue Jul 15 18:43:12 UTC 2014 - mrueckert@suse.de @@ -125,6 +154,41 @@ Thu Jul 10 14:52:01 UTC 2014 - mrueckert@suse.de added basic config file support to gem2rpm in yaml format. there is no validation as it is basically a hash where certain keys are picked up by our templates. +- added quilt series file to the sources list +- dropped empty doc package + +------------------------------------------------------------------- +Thu Jun 26 09:58:34 UTC 2014 - mrueckert@suse.de + +- update rpm macros requires to 5 + +------------------------------------------------------------------- +Wed Jun 25 17:07:59 UTC 2014 - mrueckert@suse.de + +- fix filelist for multi ruby packaging + +------------------------------------------------------------------- +Wed Jun 25 16:28:46 UTC 2014 - mrueckert@suse.de + +- add ruby 2.2 support + +------------------------------------------------------------------- +Tue Jun 24 15:19:28 UTC 2014 - mrueckert@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@suse.de + +- fixed paths in the u-a scriptlets + +------------------------------------------------------------------- +Wed Jun 18 18:47:31 UTC 2014 - mrueckert@suse.de + +- no longer provide gem2rpm-opensuse +- use new style packaging but the hardcoded version ------------------------------------------------------------------- Thu Feb 6 11:52:43 UTC 2014 - coolo@suse.com @@ -138,6 +202,7 @@ Mon Jan 13 19:52:26 UTC 2014 - coolo@suse.com - modified patches: * gem2rpm-fix-opensuse-template.diff + ------------------------------------------------------------------- Wed Jun 26 14:48:32 UTC 2013 - coolo@suse.com diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec index 0c484f4..8925245 100644 --- a/rubygem-gem2rpm.spec +++ b/rubygem-gem2rpm.spec @@ -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 @@ Release: 0 %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 @@ -46,18 +53,9 @@ Group: Development/Languages/Ruby PreReq: update-alternatives %description -Generate source rpms and rpm spec files from a Ruby Gem. +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 @@ Usually in RDoc and RI formats. %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 -%post +%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%{mod_branch} %{mod_weight} + %{_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 +%preun -n ruby2.1-rubygem-gem2rpm if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove gem2rpm %{_bindir}/gem2rpm%{mod_branch} + /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 +%files -n ruby2.1-rubygem-gem2rpm %defattr(-,root,root,-) -%doc gem2rpm.yml %{mod_full_name}/templates/sles12*.spec.erb -%{_bindir}/gem2rpm%{mod_branch} +%{_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 -%{_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 %{_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 doc +%files -n ruby2.1-rubygem-gem2rpm-doc %defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ +%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 + +%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 \ + /usr/bin/gem2rpm.rbx2.2 gem2rpm.rbx2.2 /usr/bin/gem2rpm.rbx2.2-%{version} %{mod_weight} + +%preun -n rbx2.2-rubygem-gem2rpm +if [ "$1" = 0 ] ; then + /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 -n rbx2.2-rubygem-gem2rpm +%defattr(-,root,root,-) +# 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 +%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 -n rbx2.2-rubygem-gem2rpm-doc +%defattr(-,root,root,-) +%doc %{_libdir}/rubinius/gems/2.2/doc/gem2rpm-%{version} +%endif +%else +%gem_packages +%endif %changelog diff --git a/series b/series new file mode 100644 index 0000000..453f035 --- /dev/null +++ b/series @@ -0,0 +1,7 @@ +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