rpms/ruby-qpid/F-9 .cvsignore, 1.6, 1.7 ruby-qpid.spec, 1.5, 1.6 sources, 1.6, 1.7

[Nuno Santos]

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5018

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2009 19:57:48 -0000	1.6
+++ .cvsignore	30 Jan 2009 22:07:34 -0000	1.7
@@ -1 +1 @@
-ruby-qpid-0.4.734452.tar.gz
+ruby-qpid-0.4.738618.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/ruby-qpid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-qpid.spec	15 Jan 2009 19:57:49 -0000	1.5
+++ ruby-qpid.spec	30 Jan 2009 22:07:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.734452
+Version: 	0.4.738618
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -7,23 +7,27 @@
 License:        ASL 2.0
 URL:            http://qpid.apache.org/
 Source0:        %{name}-%{version}.tar.gz
-# svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby ruby-qpid
+# svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \
+#  ruby-qpid
 # tar czf ruby-qpid.tar.gz ruby-qpid
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 BuildArch:      noarch
 
 BuildRequires:  ruby
-BuildRequires:	amqp
+BuildRequires:  ruby-devel
+BuildRequires:	rubygem-rake
+BuildRequires:  amqp >= 1.0.%{version}
+BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.%{version}
+Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
-
 %description
 The Apache Qpid project's Ruby language client for AMQP.
 
@@ -31,15 +35,20 @@
 %setup -q -n %{name}-%{version}
 
 %build
-ruby -I lib -r qpid -e 'Qpid::Spec010::load()'
+pushd ruby
+rake build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
-install -pm 644 lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
+install -pm 644 ruby/lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+install -pm 644 ruby/lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
+install -pm 644 ruby/lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+# to quiet rpmlint warning
+chmod -x ruby/LICENSE.txt
+rm -fr specs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,20 +57,18 @@
 %defattr(-,root,root,-)
 %{ruby_sitelib}/qpid
 %{ruby_sitelib}/qpid.rb
-%doc LICENSE.txt NOTICE.txt
+%doc ruby/LICENSE.txt ruby/NOTICE.txt ruby/RELEASE_NOTES
 
 %changelog
-* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
-- Rebased to svn rev 734452
-
-* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
-- Rebased to svn rev 728142
+* Thu Jan 29 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
 
-* Tue Dec  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.722557-1
-- Rebased to svn rev 722557
+* Wed Dec 10 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.725356-1
+- Updated spec file to work with RHEL 4 and earlier Fedora versions
 
-* Tue Nov 25 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720585-1
-- Rebased to svn rev 720585
+* Mon Dec  1 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.722126-1
+- Changed version numbering to fit other qpid packages
+- Added release notes to doc directory
 
 * Fri Nov 14 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-1
 - Updated to work with qpid M4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2009 19:57:49 -0000	1.6
+++ sources	30 Jan 2009 22:07:34 -0000	1.7
@@ -1 +1 @@
-4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz
+01fcbfd9e95cc24ffa1923bd497093c1  ruby-qpid-0.4.738618.tar.gz