rpms/perl-Net-CUPS/devel dest_test.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Net-CUPS.spec, 1.7, 1.8 sources, 1.3, 1.4

[Chris Weyl (cweyl)]

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3508

Modified Files:
	.cvsignore perl-Net-CUPS.spec sources 
Added Files:
	dest_test.patch 
Log Message:
* Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-2
- and remove i18n.h from CUPS.xs.  See bz#455190
- add zlib-devel as a BR.  See bz#455192
- patch t/03_destination.t to not test add/remove functionality -- this is an
  admin action under Fedora, if memory serves


dest_test.patch:

--- NEW FILE dest_test.patch ---
--- t/03_destination.t.orig	2008-07-13 12:57:24.069082279 -0700
+++ t/03_destination.t	2008-07-13 13:01:22.587086420 -0700
@@ -31,25 +31,31 @@
 
 ok ($ppd_file);
 
-my $name = "yatp";
-my $location = "nowhere";
-my $printer_info = "blahblah";
-my $device_uri = 'socket://192.168.1.3:9100';
+# SKIP these unless we're running with admin privs and REALLY want to :)
+SKIP: {
+    skip "Not testing destination add/remove", 4 
+        unless exists $ENV{NET_CUPS_TEST_ADDDEL_DEST};
 
-$cups->addDestination($name, $location, $printer_info, $ppd_file, $device_uri);
+    my $name = "yatp";
+    my $location = "nowhere";
+    my $printer_info = "blahblah";
+    my $device_uri = 'socket://192.168.1.3:9100';
 
-my $dest = $cups->getDestination( $name );
+    $cups->addDestination($name, $location, $printer_info, $ppd_file, $device_uri);
 
-ok ($dest);
+    my $dest = $cups->getDestination( $name );
 
-my $description = $dest->getDescription();
+    ok ($dest);
 
-ok( $description eq $printer_info );
+    my $description = $dest->getDescription();
 
-my $uri = $dest->getUri();
+    ok( $description eq $printer_info );
 
-ok( $uri eq $device_uri );
+    my $uri = $dest->getUri();
 
-$cups->deleteDestination($name);
+    ok( $uri eq $device_uri );
 
-ok (! $cups->getDestination($name));
+    $cups->deleteDestination($name);
+
+    ok (! $cups->getDestination($name));
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2007 19:49:13 -0000	1.3
+++ .cvsignore	13 Jul 2008 20:29:26 -0000	1.4
@@ -1 +1 @@
-Net-CUPS-0.55.tar.gz
+Net-CUPS-0.56.tar.gz


Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Net-CUPS.spec	7 Mar 2008 02:11:02 -0000	1.7
+++ perl-Net-CUPS.spec	13 Jul 2008 20:29:26 -0000	1.8
@@ -1,16 +1,26 @@
 Name:           perl-Net-CUPS
-Version:        0.55
-Release:        4%{?dist}
+Version:        0.56
+Release:        2%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-CUPS/
 Source0:        http://www.cpan.org/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# non-perl
+BuildRequires:  cups-devel 
+# see BZ#455192
+BuildRequires:  zlib-devel 
+
+# perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
-BuildRequires:  cups-devel 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+
+# keep from running tests which require admin privs under the Fedora setup
+Patch0:         dest_test.patch
 
 %description
 Net::CUPS is an interface to the Common Unix Printing System API.  If you feel
@@ -18,9 +28,17 @@
 
 %prep
 %setup -q -n Net-CUPS-%{version}
+%patch0
 
 find . -type f -exec chmod -c -x {} +
 
+# until we get BZ#455190 resolved (one way or the other) 
+perl -pi -e 's|^#include <cups/i18n.h>|/*#include <cups/i18n.h>*/|' CUPS.xs
+
+# grr. see the long languishing RT#35966
+#   (http://rt.cpan.org/Public/Bug/Display.html?id=35966)
+perl -pi -e 's|IPP_|Net::CUPS::IPP_|' lib/Net/CUPS/Destination.pm
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
@@ -37,7 +55,9 @@
 %{_fixperms} %{buildroot}/*
 
 %check
+%{?!_with_network_tests: mv t/03_destination.t . }
 make test
+%{?!_with_network_tests: mv 03_destination.t t/  }
 
 %clean
 rm -rf %{buildroot}
@@ -51,6 +71,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-2
+- and remove i18n.h from CUPS.xs.  See bz#455190
+- add zlib-devel as a BR.  See bz#455192
+- patch t/03_destination.t to not test add/remove functionality -- this is an
+  admin action under Fedora, if memory serves
+
+* Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-1
+- update to 0.56
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.55-4
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2007 19:49:14 -0000	1.3
+++ sources	13 Jul 2008 20:29:26 -0000	1.4
@@ -1 +1 @@
-e2667d6d9b63befac5d38d7f0d4aadda  Net-CUPS-0.55.tar.gz
+ae0d60ca4544d551177f923c3d29da5c  Net-CUPS-0.56.tar.gz