SPECS: perl-Mozilla-LDAP.spec - added lib paths (mozilla/seamonkey...

hawk hawk at pld-linux.org
Sun May 21 08:49:42 CEST 2006


Author: hawk                         Date: Sun May 21 06:49:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added lib paths (mozilla/seamonkey libs are no longer in /usr/lib)
- bumped {mozilla,seamonkey}-devel BR versions
- added R: {mozilla,seamonkey}-libs (depends on bcond)
- release 10

---- Files affected:
SPECS:
   perl-Mozilla-LDAP.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/perl-Mozilla-LDAP.spec
diff -u SPECS/perl-Mozilla-LDAP.spec:1.24 SPECS/perl-Mozilla-LDAP.spec:1.25
--- SPECS/perl-Mozilla-LDAP.spec:1.24	Sat May 20 16:00:03 2006
+++ SPECS/perl-Mozilla-LDAP.spec	Sun May 21 08:49:36 2006
@@ -2,25 +2,30 @@
 #
 # Conditional build:
 %bcond_without	tests	# do not perform "make test"
-%bcond_with	seamonkey	# build without seamonkey-devel
+%bcond_without	seamonkey	# build without seamonkey-devel
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	PerLDAP - Mozilla::LDAP perl modules
 Summary(pl):	PerLDAP - moduły perla Mozilla::LDAP
 Name:		perl-Mozilla-LDAP
 Version:	1.4.1
-Release:	9
+Release:	10
 License:	MPL 1.1
 Group:		Development/Languages/Perl
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/directory/perldap/perldap-%{version}.tar.gz
 # Source0-md5:	39a784c94f6fbed4682f681cd2f183fa
 %if %{with seamonkey}
-BuildRequires:	seamonkey-devel >= 1.0
+BuildRequires:	seamonkey-devel >= 1.0.1-2
 %else
-BuildRequires:	mozilla-devel >= 1.0-10
+BuildRequires:	mozilla-devel >= 1.7.13-3
 %endif
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
+%if %{with seamonkey}
+Requires:	seamonkey-libs = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides seamonkey-libs)
+%else
+Requires:	mozilla-libs = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-libs)
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,7 +54,7 @@
 /usr
 yes
 yes
--lldap50 -lssldap50 -lprldap50 -lssl3 -lpthread
+%{!?with_seamonkey:-L/usr/lib/mozilla}%{?with_seamonkey:-L/usr/lib/seamonkey} -lldap50 -lssldap50 -lprldap50 -lssl3 -lpthread
 EOF
 
 %{__make} \
@@ -95,6 +100,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/05/21 06:49:36  hawk
+- added lib paths (mozilla/seamonkey libs are no longer in /usr/lib)
+- bumped {mozilla,seamonkey}-devel BR versions
+- added R: {mozilla,seamonkey}-libs (depends on bcond)
+- release 10
+
 Revision 1.24  2006/05/20 14:00:03  hawk
 - oops!
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/perl-Mozilla-LDAP.spec?r1=1.24&r2=1.25&f=u



More information about the pld-cvs-commit mailing list