Browse Source

2014-11-12 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* QtRuby, korundum: fixed install location
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9079 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
3c5ca33c55
2 changed files with 49 additions and 42 deletions
  1. 21 17
      Q/QtRuby/QtRuby-vl.spec
  2. 28 25
      k/korundum/korundum-vl.spec

+ 21 - 17
Q/QtRuby/QtRuby-vl.spec

@@ -1,17 +1,17 @@
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.6)
 
-%global ruby_lib %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')
-%global ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
+%global ruby_vendorlib %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
+%global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')
 
 Name:    QtRuby
 Summary:  Ruby bindings for Qt4
 Summary(ja): Qt4 の Ruby バインディング
 Version: 4.14.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: LGPLv2+ and GPLv2+
 Group:   System Environment/Libraries
-URL:     http://techbase.kde.org/Development/Languages/Qyoto
+URL:     https://techbase.kde.org/Development/Languages/Ruby
 
 Source0: http://download.kde.org/stable/%{version}/src/qtruby-%{version}.tar.xz
 
@@ -56,8 +56,8 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 
 %cmake \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_arch} \
-    -DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_lib} \
+    -DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_vendorarch} \
+    -DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_vendorlib} \
     ..
 popd
 
@@ -79,17 +79,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB README
 %{_libdir}/libqtruby4shared.so.*
-%{ruby_lib}/Qt*.rb
-%{ruby_lib}/Qt/
-%{ruby_lib}/phonon/
-%{ruby_lib}/qscintilla/
-%{ruby_lib}/qtdeclarative/
-%{ruby_lib}/qtscript/
-%{ruby_lib}/qttest/
-%{ruby_lib}/qtuitools/
-%{ruby_lib}/qtwebkit/
-%{ruby_lib}/qwt/
-%{ruby_arch}/*.so
+%{ruby_vendorlib}/Qt*.rb
+%{ruby_vendorlib}/Qt/
+%{ruby_vendorlib}/phonon/
+%{ruby_vendorlib}/qscintilla/
+%{ruby_vendorlib}/qtdeclarative/
+%{ruby_vendorlib}/qtscript/
+%{ruby_vendorlib}/qttest/
+%{ruby_vendorlib}/qtuitools/
+%{ruby_vendorlib}/qtwebkit/
+%{ruby_vendorlib}/qwt/
+%{ruby_vendorarch}/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -101,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/qtruby4
 
 %changelog
+* Wed Nov 12 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.14.2-2
+- installed modules to vendor_ruby
+- fixed URL
+
 * Sun Nov  9 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.14.2-1
 - splitted from kdebindings
 

+ 28 - 25
k/korundum/korundum-vl.spec

@@ -1,11 +1,11 @@
-%global ruby_lib %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')
-%global ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
+%global ruby_vendorlib %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
+%global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')
 
 Name:    korundum
 Summary:  Ruby bindings for KDE
 Summary(ja): KDE の Ruby バインディング
 Version: 4.12.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: LGPLv2+ and GPLv2+
 Group:   System Environment/Libraries
@@ -59,8 +59,8 @@ pushd %{_target_platform}
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
     -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_arch} \
-    -DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_lib} \
+    -DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_vendorarch} \
+    -DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_vendorlib} \
     ..
 popd
 
@@ -82,26 +82,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB README
 %{_bindir}/krubyapplication
-%{ruby_lib}/KDE/
-%{ruby_lib}/akonadi/
-%{ruby_lib}/khtml/
-%{ruby_lib}/kio/
-%{ruby_lib}/ktexteditor/
-%{ruby_lib}/okular/
-%{ruby_lib}/solid/
-%{ruby_lib}/soprano/
-%{ruby_lib}/nepomuk/
-%{ruby_arch}/akonadi.so
-%{ruby_arch}/kate.so
-%{ruby_arch}/khtml.so
-%{ruby_arch}/kio.so
-%{ruby_arch}/korundum4.so
-%{ruby_arch}/ktexteditor.so
-%{ruby_arch}/okular.so
-%{ruby_arch}/plasma_applet.so
-%{ruby_arch}/solid.so
-%{ruby_arch}/soprano.so
-%{ruby_arch}/nepomuk.so
+%{ruby_vendorlib}/KDE/
+%{ruby_vendorlib}/akonadi/
+%{ruby_vendorlib}/khtml/
+%{ruby_vendorlib}/kio/
+%{ruby_vendorlib}/ktexteditor/
+%{ruby_vendorlib}/okular/
+%{ruby_vendorlib}/solid/
+%{ruby_vendorlib}/soprano/
+%{ruby_vendorlib}/nepomuk/
+%{ruby_vendorarch}/akonadi.so
+%{ruby_vendorarch}/kate.so
+%{ruby_vendorarch}/khtml.so
+%{ruby_vendorarch}/kio.so
+%{ruby_vendorarch}/korundum4.so
+%{ruby_vendorarch}/ktexteditor.so
+%{ruby_vendorarch}/okular.so
+%{ruby_vendorarch}/plasma_applet.so
+%{ruby_vendorarch}/solid.so
+%{ruby_vendorarch}/soprano.so
+%{ruby_vendorarch}/nepomuk.so
 %{_libdir}/kde4/krubypluginfactory.so
 %{_datadir}/applications/kde4/dbpedia_references.desktop
 %{_datadir}/kde4/apps/dbpedia_references
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rbkconfig_compiler4
 
 %changelog
+* Wed Nov 12 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.5-2
+- installed modules to vendor_ruby
+
 * Sun Nov  9 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.5-1
 - splitted from kdebindings