[ruby-qt/f16] 4.7.4 sync packaging improvements from master/ branch

[Rex Dieter]

commit 21316809ece48f2bff9e3191915e28330dc07b63
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 17 08:33:39 2012 -0600

    4.7.4
    sync packaging improvements from master/ branch

 .gitignore   |    2 +-
 ruby-qt.spec |   80 ++++++++++++++++++++++++++++++++++++---------------------
 sources      |    2 +-
 3 files changed, 52 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4022ff1..766f92b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/qtruby-4.7.0.tar.bz2
+/qtruby-4.7.4.tar.bz2
diff --git a/ruby-qt.spec b/ruby-qt.spec
index a2b1a19..e02e364 100644
--- a/ruby-qt.spec
+++ b/ruby-qt.spec
@@ -2,32 +2,36 @@
 %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 
 Summary: Ruby bindings for Qt 4
-Name: ruby-qt
-Version: 4.7.0
+Name:    ruby-qt
+Version: 4.7.4
 Release: 1%{?dist}
+
 License: LGPLv2+
-Group: Development/Languages
-URL: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/qtruby-%{version}.tar.bz2
+Group:   Development/Languages
+URL:     https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
+Source:  ftp://ftp.kde.org/pub/kde/stable/%{version}/src/qtruby-%{version}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: ruby(abi) = 1.8
-Requires: qt4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kde4-macros(api) >= 2
-BuildRequires: qt4-devel
-BuildRequires: qt-webkit-devel
-BuildRequires: qwt-devel
-BuildRequires: qscintilla-devel
-BuildRequires: phonon-devel
-BuildRequires: smokegen-devel
-BuildRequires: smokeqt-devel
+
 BuildRequires: cmake
-BuildRequires: ruby
-BuildRequires: ruby-devel
+BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(qimageblitz)
+BuildRequires: pkgconfig(QtCore) pkgconfig(QtScript) pkgconfig(QtTest) pkgconfig(QtUiTools)
+BuildRequires: pkgconfig(QtWebKit)
+BuildRequires: ruby-devel ruby
+BuildRequires: qscintilla-devel
+BuildRequires: qwt-devel
+BuildRequires: smokeqt-devel >= %{version}
+
 Obsoletes: QtRuby < 4.7.0
 Provides: QtRuby = %{version}-%{release}
 Provides: QtRuby4 = %{version}-%{release}
 Provides: ruby(qt) = %{version}
+Provides: qtruby = %{version}-%{release}
+Provides: qtruby%{?_isa} = %{version}-%{release}
+
+Requires: ruby(abi) = 1.8
+%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}}
+Requires: smokeqt%{?_isa} >= %{version}
 
 %description
 This package includes ruby bindings for Qt 4.
@@ -35,10 +39,11 @@ This package includes ruby bindings for Qt 4.
 %package devel
 Group: Development/Languages
 Summary: Development files for QtRuby
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Obsoletes: QtRuby-devel < 4.7.0
 Provides: QtRuby-devel = %{version}-%{release}
 Provides: QtRuby4-devel = %{version}-%{release}
+Provides: qtruby-devel = %{version}-%{release}
 
 %description devel
 This package includes the header files you will need to compile
@@ -52,9 +57,11 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description examples
 %{summary}.
 
+
 %prep
 %setup -q -n qtruby-%{version}
  
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -63,44 +70,57 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
  
+
 %install
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
  
+
 %clean
 rm -rf %{buildroot}
  
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
  
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL README
-%{_libdir}/*.so.*
+%{_libdir}/libqtruby4shared.so.2*
+%{ruby_sitearch}/*.so
+%{ruby_sitelib}/phonon/
+%{ruby_sitelib}/qscintilla/
+%{ruby_sitelib}/qtdeclarative/
+%{ruby_sitelib}/qwt/
 %{ruby_sitelib}/Qt/
 %{ruby_sitelib}/Qt*.rb
 %{ruby_sitelib}/qtscript/
 %{ruby_sitelib}/qttest/
 %{ruby_sitelib}/qtuitools/
 %{ruby_sitelib}/qtwebkit/
-%{ruby_sitelib}/phonon/
-%{ruby_sitelib}/qscintilla/
-%{ruby_sitelib}/qtdeclarative/
-%{ruby_sitelib}/qwt/
-%{ruby_sitearch}/*.so
 
 %files devel
 %defattr(-, root, root, 0755)
-%{_libdir}/*.so
-%{_bindir}/*
-%{_includedir}/*
-%{_datadir}/qtruby4/cmake/*
+%{_bindir}/rbqtapi
+%{_bindir}/rbrcc
+%{_bindir}/rbuic4
+%dir %{_datadir}/qtruby4/
+%{_datadir}/qtruby4/cmake/
+%{_libdir}/libqtruby4shared.so
+%{_includedir}/qtruby/
 
 %files examples
 %defattr(-, root, root, 0755)
 %doc examples
 
+
 %changelog 
+* Tue Jan 17 2012 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-1
+- 4.7.4
+- sync packaging improvements from master/ branch
+
+* Tue Sep 06 2011 Than Ngo <than at redhat.com> - 4.7.1-1
+- 4.7.1
+
 * Tue Aug 02 2011 Than Ngo <than at redhat.com> - 4.7.0-1
 - 4.7.0
diff --git a/sources b/sources
index 4f2798d..45b216a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d17198b985f954cedd92ab669623de59  qtruby-4.7.0.tar.bz2
+5e618d2450e2507a6e69494b64e404c5  qtruby-4.7.4.tar.bz2