rpms/perl-Alien-SeleniumRC/devel Alien-Selenium-system-jar.diff, NONE, 1.1 perl-Alien-SeleniumRC.spec, 1.6, 1.7

[Emmanuel Seyman]

Author: eseyman

Update of /cvs/pkgs/rpms/perl-Alien-SeleniumRC/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19550

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

* 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



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/devel/perl-Alien-SeleniumRC.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Alien-SeleniumRC.spec	29 Apr 2010 15:55:34 -0000	1.6
+++ perl-Alien-SeleniumRC.spec	23 May 2010 20:30:44 -0000	1.7
@@ -1,15 +1,17 @@
 Name:           perl-Alien-SeleniumRC
 Version:        1.03
-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://search.cpan.org/CPAN/authors/id/H/HI/HISSO/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
 
 %{?perl_default_filter}
 
@@ -23,6 +25,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
@@ -52,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun May 23 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
+
 * Thu Apr 29 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.03-2
 - Mass rebuild with perl-5.12.0