[svn] r5900 - in trunk/rpms: cppunit perl-DBD-Sybase sdparm

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-10-09 17:49:56 +0200 (Tue, 09 Oct 2007)
New Revision: 5900

Modified:
   trunk/rpms/cppunit/cppunit.spec
   trunk/rpms/perl-DBD-Sybase/perl-DBD-Sybase.spec
   trunk/rpms/sdparm/sdparm.spec
Log:
Updates

Modified: trunk/rpms/cppunit/cppunit.spec
===================================================================
--- trunk/rpms/cppunit/cppunit.spec	2007-10-08 18:55:20 UTC (rev 5899)
+++ trunk/rpms/cppunit/cppunit.spec	2007-10-09 15:49:56 UTC (rev 5900)
@@ -7,12 +7,13 @@
 Release: 3
 License: LGPL
 Group: Development/Libraries
-URL: http://cppunit.sourceforge.net/
+URL: http://cppunit.sourceforge.net/cppunit-wiki
 
 Source: http://dl.sf.net/cppunit/cppunit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: doxygen, graphviz
+%{!?_without_doxygen:BuildRequires: doxygen}
+%{!?_without_graphviz:BuildRequires: graphviz}
 
 %description
 CppUnit is the C++ port of the famous JUnit framework for unit testing.
@@ -34,7 +35,8 @@
 %setup
 
 %build
-%configure --enable-doxygen
+%configure \
+%{!?_without_doxygen:--enable-doxygen}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -53,7 +55,6 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS BUGS ChangeLog COPYING NEWS README THANKS TODO doc/FAQ
-%doc %{_mandir}/man1/*.1*
 %{_bindir}/DllPlugInTester
 %{_datadir}/aclocal/cppunit.m4
 %{_libdir}/libcppunit*.so.*
@@ -61,6 +62,7 @@
 %files devel
 %defattr(-, root, root, 0755)
 %doc doc/html/*
+%doc %{_mandir}/man1/cppunit.1*
 %{_bindir}/cppunit-config
 %{_includedir}/cppunit/
 %{_libdir}/libcppunit.a

Modified: trunk/rpms/perl-DBD-Sybase/perl-DBD-Sybase.spec
===================================================================
--- trunk/rpms/perl-DBD-Sybase/perl-DBD-Sybase.spec	2007-10-08 18:55:20 UTC (rev 5899)
+++ trunk/rpms/perl-DBD-Sybase/perl-DBD-Sybase.spec	2007-10-09 15:49:56 UTC (rev 5900)
@@ -2,6 +2,13 @@
 # Authority: dag
 # Upstream: Michael Peppler <mpeppler$peppler,org>
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?rh7:%define _with_threaded 1}
+%{?el2:%define _with_threaded 1}
+
+%{?_with_sybase:%define sybver 12.5}
+
 %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
 %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
@@ -18,7 +25,11 @@
 Source: http://www.cpan.org/modules/by-module/DBD/DBD-Sybase-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+#%{?_with_sybase:BuildArch: i386}
 BuildRequires: perl
+BuildRequires: perl(DBI) >= 1.50
+%{!?_with_sybase:BuildRequires: freetds-devel}
+%{?_with_sybase:BuildRequires: sybase-openclient >= %{sybver}}
 
 %description
 perl-DBD-Sybase is a Perl module.
@@ -26,8 +37,20 @@
 %prep
 %setup -n %{real_name}-%{version}
 
+%{__perl} -pi.orig -e '
+    s|SYBASE/lib\b|SYBASE/%{_lib}|g;
+    s|^configPwd.+||g;
+' Makefile.PL
+
 %build
-CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
+%{!?_with_sybase:export SYBASE="/usr"}
+%{?_with_sybase:export SYBASE="/opt/sybase-%{sybver}" SYBASE_OCS="OCS"}
+
+CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}" \
+    --chained="y" \
+%{!?_with_threaded:--threaded_libs="n"} \
+%{?_with_threaded:--threaded_libs="y"} \
+    --accept_test_defaults
 %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
 
 %install
@@ -46,13 +69,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc BUGS CHANGES MANIFEST META.yml README README.freetds README.vms eg/
-%doc %{_mandir}/man3/DBD::Sybase.3pm*
-#%doc %{_mandir}/man3/*.3pm*
+%doc %{_mandir}/man3/DBD::Sybase.3*
 %dir %{perl_vendorarch}/DBD/
 %{perl_vendorarch}/DBD/Sybase.pm
 %dir %{perl_vendorarch}/auto/DBD/
 %{perl_vendorarch}/auto/DBD/Sybase/
+%exclude %{perl_vendorarch}/DBD/dbd-sybase.pod
 
 %changelog
 * Fri Oct 05 2007 Dag Wieers <dag at wieers.com> - 1.08-1
+- Added fixes for Sybase and freetds compilation. (Tom G. Christensen)
 - Initial package. (using DAR)

Modified: trunk/rpms/sdparm/sdparm.spec
===================================================================
--- trunk/rpms/sdparm/sdparm.spec	2007-10-08 18:55:20 UTC (rev 5899)
+++ trunk/rpms/sdparm/sdparm.spec	2007-10-09 15:49:56 UTC (rev 5900)
@@ -3,9 +3,9 @@
 
 Summary: List or change SCSI disk parameters
 Name: sdparm
-Version: 1.01
+Version: 1.02
 Release: 1
-License: FreeBSD
+License: BSD
 Group: System Environment/Base
 URL: http://www.torque.net/sg/sdparm.html
 
@@ -46,6 +46,9 @@
 %{_bindir}/sdparm
 
 %changelog
+* Tue Oct 09 2007 Dag Wieers <dag at wieers.com> - 1.02-1
+- Updated to release 1.02.
+
 * Sun Apr 15 2007 Dag Wieers <dag at wieers.com> - 1.01-1
 - Updated to release 1.01.