diff options
| author | Guillermo Gomez S. (Gomix) <guillermo.gomez@gmail.com> | 2012-02-12 10:53:26 -0430 |
|---|---|---|
| committer | Guillermo Gomez S. (Gomix) <guillermo.gomez@gmail.com> | 2012-02-12 10:53:26 -0430 |
| commit | bafcb679435f7369a89b290d3ef0512c6278f9d2 (patch) | |
| tree | 8f7688110eefc020e0d4f08ea0638e20eb27f831 /rubygem-kgio.spec | |
| parent | d3e7a8ce142c130201bad2c719d3b99ec713454b (diff) | |
| download | rubygem-kgio-bafcb679435f7369a89b290d3ef0512c6278f9d2.tar.gz rubygem-kgio-bafcb679435f7369a89b290d3ef0512c6278f9d2.tar.xz rubygem-kgio-bafcb679435f7369a89b290d3ef0512c6278f9d2.zip | |
cloned/merged f17 spec file
Diffstat (limited to 'rubygem-kgio.spec')
| -rw-r--r-- | rubygem-kgio.spec | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/rubygem-kgio.spec b/rubygem-kgio.spec index 33d4de1..134c158 100644 --- a/rubygem-kgio.spec +++ b/rubygem-kgio.spec @@ -20,13 +20,10 @@ Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) BuildRequires: ruby BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: rubygems-devel +BuildRequires: ruby(rubygems) BuildRequires: ruby-devel -<<<<<<< HEAD -======= BuildRequires: ruby-irb BuildRequires: rubygems-devel ->>>>>>> f17 BuildRequires: rubygem(minitest) Provides: rubygem(%{gem_name}) = %{version} ExcludeArch: ppc ppc64 @@ -47,15 +44,6 @@ Documentation for %{name} %prep %setup -q -c -T -<<<<<<< HEAD - -%build -mkdir -p .%{gem_dir} -export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -gem install --local --install-dir .%{gem_dir} \ - -V \ - --force %{SOURCE0} -======= mkdir -p .%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" gem install \ @@ -65,24 +53,17 @@ gem install \ --force \ --rdoc \ %{SOURCE0} ->>>>>>> f17 # Adjusting minor permissions chmod a+r .%{gem_instdir}/ChangeLog chmod a+r .%{gem_instdir}/NEWS -<<<<<<< HEAD -======= %build ->>>>>>> f17 %install rm -rf %{buildroot} mkdir -p %{buildroot}%{gem_dir} -<<<<<<< HEAD -======= mkdir -p %{buildroot}%{gem_extdir}/lib ->>>>>>> f17 cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ patch %{buildroot}%{gem_instdir}/test/test_autopush.rb %{SOURCE1} @@ -101,32 +82,19 @@ rm -f %{buildroot}/%{gem_instdir}/GIT-VERSION-GEN rm -rf %{buildroot}%{gem_instdir}/.yardoc rm -rf %{buildroot}%{gem_instdir}/ext -<<<<<<< HEAD -install -d -m0755 %{buildroot}%{ruby_vendorarchdir} -mv %{buildroot}%{gem_libdir}/kgio_ext.so %{buildroot}%{ruby_vendorarchdir} -======= install -d -m0755 %{buildroot}%{gem_extdir} mv %{buildroot}%{gem_instdir}/lib/kgio_ext.so %{buildroot}%{gem_extdir}/lib/ ->>>>>>> f17 %check # Patch test_autopush.rb cd %{buildroot}%{gem_instdir} -<<<<<<< HEAD -RUBYOPT="-Ilib -I%{buildroot}%{ruby_vendorarchdir} -Itest" testrb test/test_* -======= RUBYOPT="-Ilib -I%{buildroot}%{ruby_sitearch} -Itest" testrb test/test_* ->>>>>>> f17 %clean rm -rf %{buildroot} %files doc -<<<<<<< HEAD -%doc %{gem_docdir} -======= %doc %{gem_dir}/doc/%{gem_name}-%{version} ->>>>>>> f17 %doc %{gem_instdir}/TODO %doc %{gem_instdir}/LATEST %doc %{gem_instdir}/Rakefile @@ -135,28 +103,17 @@ rm -rf %{buildroot} %doc %{gem_instdir}/test %files -<<<<<<< HEAD -%{ruby_vendorarchdir}/kgio_ext.so -%dir %{gem_instdir} -%dir %{gem_libdir} -======= %{gem_extdir} %dir %{gem_instdir} %dir %{gem_instdir}/lib ->>>>>>> f17 %doc %{gem_instdir}/LICENSE %doc %{gem_instdir}/COPYING %doc %{gem_instdir}/README %doc %{gem_instdir}/NEWS %doc %{gem_instdir}/ChangeLog %{gem_cache} -<<<<<<< HEAD -%{gem_spec} -%{gem_libdir}/kgio.rb -======= %{gem_spec} %{gem_instdir}/lib/kgio.rb ->>>>>>> f17 %changelog * Sun Feb 12 2012 Guillermo Gómez <guillermo.gomez@gmail.com> - 2.7.0-5 @@ -165,7 +122,6 @@ rm -rf %{buildroot} * Tue Jan 07 2012 Guillermo Gómez <guillermo.gomez@gmail.com> - 2.7.0-4 - Requires fixed for Ruby 1.9 -- Spec file adjusted to use new macros * Sun Jan 01 2012 Guillermo Gómez <guillermo.gomez@gmail.com> - 2.7.0-3 - Path to kgio_ext.so at spec file check section fixed |