rpms/xchat-ruby/F-7 xchat-ruby-dont-ignore-cflags.patch, NONE, 1.1 xchat-ruby-global-rubyenv.patch, NONE, 1.1 xchat-ruby.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Conrad Meyer (konradm)]

Author: konradm

Update of /cvs/pkgs/rpms/xchat-ruby/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21737

Modified Files:
	.cvsignore sources 
Added Files:
	xchat-ruby-dont-ignore-cflags.patch 
	xchat-ruby-global-rubyenv.patch xchat-ruby.spec 
Log Message:
xchat-ruby - created F-7 branch

xchat-ruby-dont-ignore-cflags.patch:

--- NEW FILE xchat-ruby-dont-ignore-cflags.patch ---
--- xchat-ruby-1.2-src/src/Makefile	2007-04-26 04:16:32.000000000 -0700
+++ xchat-ruby-1.2-src-modified/src/Makefile	2007-11-27 17:17:24.000000000 -0800
@@ -1,8 +1,8 @@
 RUBY=ruby
 CC=gcc
-CFLAGS=-g -Wall -O1 -fPIC
+CFLAGS+=-fPIC
 
 OBJ=xchat-ruby.o
 
 ARCHDIR=`$(RUBY) -rrbconfig -e "puts Config::CONFIG['archdir']"`
 

xchat-ruby-global-rubyenv.patch:

--- NEW FILE xchat-ruby-global-rubyenv.patch ---
diff -ur xchat-ruby-1.2-src/src/xchat-ruby-plugin.rb xchat-ruby-1.2-src-patched/src/xchat-ruby-plugin.rb
--- xchat-ruby-1.2-src/src/xchat-ruby-plugin.rb 2007-04-26 04:16:32.000000000 -0700
+++ xchat-ruby-1.2-src-patched/src/xchat-ruby-plugin.rb 2007-11-17 20:06:25.000000000 -0800
@@ -416,6 +416,7 @@
 
     def XChatRubyEnvironment.initialize_ruby_environment
       envfile = get_info( "xchatdir" ) + "/rubyenv"
+      envfile = "/etc/xchat-rubyenv" if not File.exist? envfile
       begin
         File.open( envfile, "r" ) do |file|
           file.each do |line|


--- NEW FILE xchat-ruby.spec ---
Name: xchat-ruby
Version: 1.2
Release: 5%{?dist}
Summary: An X-Chat plugin providing scripting functionality with Ruby

Group: Applications/Internet
License: GPLv2+
URL: http://xchat-ruby.sourceforge.net/
Source0: http://downloads.sourceforge.net/xchat-ruby/%{name}-%{version}-src.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0: xchat-ruby-global-rubyenv.patch
Patch1: xchat-ruby-dont-ignore-cflags.patch

BuildRequires: ruby(abi) = 1.8
BuildRequires: ruby-devel ruby
Requires: ruby(abi) = 1.8
Requires: xchat

%description
For those of us that prefer the Ruby programming language above all
others, the XChat-Ruby Plugin now allows X-Chat plugins to be written
in Ruby, in addition to the other supported scripting interfaces. This
means that, for the first time, you can use a purely object-oriented
language in which to write X-Chat plugins.


%prep
%setup -q -n xchat-ruby-%{version}-src
%patch0 -p1
%patch1 -p1


%build
cd src
CFLAGS="%{optflags}" make %{?_smp_mflags}


%install
# Get arch-specific load paths
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}

rm -rf %{buildroot}
mkdir %{buildroot}
cd src
# xchat-ruby's make install is broken
install -D xchat-ruby.so %{buildroot}%{_libdir}/xchat/plugins/xchat-ruby.so
mkdir -p %{buildroot}%{_sysconfdir}
cat <<EOS >%{buildroot}%{_sysconfdir}/xchat-rubyenv
/usr/lib/ruby/site_ruby/1.8
%{ruby_sitearch}
/usr/lib/ruby/site_ruby
/usr/lib/ruby/1.8
%{ruby_arch}
.
EOS


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/xchat-rubyenv
%doc README COPYING
%{_libdir}/xchat/plugins/xchat-ruby.so


%changelog
* Wed Nov 28 2007 Conrad Meyer <konrad at tylerc.org> - 1.2-5
- SourceURL includes %%{version}
- BuildRequire Ruby 1.8 ABI for consistancy with Require
- Fixed macro in changelog

* Tue Nov 27 2007 Conrad Meyer <konrad at tylerc.org> - 1.2-4
- Default load path now contains arch-specific directories

* Tue Nov 27 2007 Conrad Meyer <konrad at tylerc.org> - 1.2-3
- Fixed xchat-rubyenv for 64-bit
- Patched Makefile to not ignore CFLAGS

* Fri Nov 23 2007 Conrad Meyer <konrad at tylerc.org> - 1.2-2
- Replaced /etc with %%{_sysconfdir}

* Fri Nov 17 2007 Conrad Meyer <konrad at tylerc.org> - 1.2-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-ruby/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2007 23:55:18 -0000	1.1
+++ .cvsignore	1 Dec 2007 08:52:44 -0000	1.2
@@ -0,0 +1 @@
+xchat-ruby-1.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-ruby/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2007 23:55:18 -0000	1.1
+++ sources	1 Dec 2007 08:52:44 -0000	1.2
@@ -0,0 +1 @@
+d9a8eafb03c88ac5d8c67b5373f10538  xchat-ruby-1.2-src.tar.gz