rpms/perl-Alien-SeleniumRC/F-13 Alien-Selenium-system-jar.diff, NONE, 1.1 perl-Alien-SeleniumRC.spec, 1.4, 1.5

[Emmanuel Seyman]

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Alien-SeleniumRC/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20180

Modified Files:
	perl-Alien-SeleniumRC.spec 
Added Files:
	Alien-Selenium-system-jar.diff 
Log Message:
Use system selenium-server

Alien-Selenium-system-jar.diff:
 SeleniumRC.pm |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE Alien-Selenium-system-jar.diff ---
--- lib/Alien/SeleniumRC.pm.orig	2010-05-23 22:11:41.000000000 +0200
+++ lib/Alien/SeleniumRC.pm	2010-05-23 22:13:36.000000000 +0200
@@ -11,7 +11,7 @@
     my $args = shift || '';
     my $jarfile = find_jar_location();
 
-    my $cmd = "java -jar $jarfile $args";
+    my $cmd = "/usr/bin/selenium-server $args";
     if ( $ENV{SELENIUMRC_USE_SIC} ) {
         $cmd = "sudo /usr/libexec/StartupItemContext `which java` -jar $jarfile $args";
     }
@@ -27,8 +27,7 @@
 }
 
 sub find_jar_location {
-    my $pm_location = $INC{'Alien/SeleniumRC.pm'};
-    (my $src_location = $pm_location) =~ s#\.pm#/selenium-server.jar#;
+    my $src_location = '/usr/share/java/selenium-server-coreless.jar';
 
     if ($^O eq 'cygwin') {
 	$src_location = `cygpath -m '$src_location'`;


Index: perl-Alien-SeleniumRC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Alien-SeleniumRC/F-13/perl-Alien-SeleniumRC.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Alien-SeleniumRC.spec	7 Dec 2009 15:00:01 -0000	1.4
+++ perl-Alien-SeleniumRC.spec	24 May 2010 23:03:56 -0000	1.5
@@ -1,15 +1,17 @@
 Name:           perl-Alien-SeleniumRC
 Version:        1.01
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Packages the Selenium Remote Control server
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Alien-SeleniumRC/
 Source0:        http://www.cpan.org/modules/by-module/Alien/Alien-SeleniumRC-%{version}.tar.gz
+Patch0:         Alien-Selenium-system-jar.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker),perl(CPAN),perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       selenium-server
 
 %description
 Selenium Remote Control is a test tool that allows you to write automated
@@ -21,6 +23,9 @@ performs automated tasks in JavaScript.
 
 %prep
 %setup -q -n Alien-SeleniumRC-%{version}
+%patch0 -p0
+rm t/seleniumrc.t
+rm lib/Alien/SeleniumRC/selenium-server.jar
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -50,6 +55,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue May 25 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.03-3
+- Remove selenium-server.jar from the archive
+- Remove test on the internal selenium-server
+- Tell Alien::SeleniumRC to use the system selenium server
+- Add selenium-server to the Requires
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.01-2
 - rebuild against perl 5.10.1