Hello community, here is the log from the commit of package mozldap for openSUSE:Factory checked in at 2018-01-09 14:54:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozldap (Old) and /work/SRC/openSUSE:Factory/.mozldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozldap" Tue Jan 9 14:54:10 2018 rev:3 rq:562321 version:6.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/mozldap/mozldap.changes 2015-02-20 12:01:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozldap.new/mozldap.changes 2018-01-09 14:54:11.281003976 +0100 @@ -1,0 +2,11 @@ +Fri Dec 22 08:14:37 UTC 2017 - [email protected] + +- Add mozldap-perl-5.24.patch: Fix build with perl 5.24. + +------------------------------------------------------------------- +Thu Dec 7 11:14:17 UTC 2017 - [email protected] + +- Escape the usage of %{VERSION} when calling out to rpm. + RPM 4.14 has %{VERSION} defined as 'the main packages version'. + +------------------------------------------------------------------- New: ---- mozldap-perl-5.24.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozldap.spec ++++++ --- /var/tmp/diff_new_pack.J4ilJx/_old 2018-01-09 14:54:11.924973787 +0100 +++ /var/tmp/diff_new_pack.J4ilJx/_new 2018-01-09 14:54:11.928973599 +0100 @@ -1,7 +1,7 @@ # # spec file for package mozldap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009-2011 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -18,9 +18,9 @@ %define libsuffix 60 -%define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) -%define nss_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nss) -%define svrcore_ver %(rpm -q --queryformat '%{VERSION}' svrcore-devel) +%define nspr_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) +%define nss_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) +%define svrcore_ver %(rpm -q --queryformat '%%{VERSION}' svrcore-devel) Name: mozldap Version: 6.0.7 Release: 0 @@ -36,6 +36,8 @@ Patch1: mozldap-6.0.7-fix_typo.patch # PATCH-FIX-UPSTREAM mozldap-6.0.7-replace_mktemp.patch - use mkstemp instead of mktemp Patch2: mozldap-6.0.7-replace_mktemp.patch +# PATCH-FIX-UPSTREAM mozldap-perl-5.24.patch [email protected] -- Fix build tools for usage with perl 5.24 +Patch3: mozldap-perl-5.24.patch BuildRequires: cyrus-sasl-devel BuildRequires: gcc-c++ BuildRequires: svrcore-devel @@ -79,6 +81,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cd c-sdk ++++++ mozldap-perl-5.24.patch ++++++ Index: mozldap-6.0.7/c-sdk/ldap/build/replace.pm =================================================================== --- mozldap-6.0.7.orig/c-sdk/ldap/build/replace.pm +++ mozldap-6.0.7/c-sdk/ldap/build/replace.pm @@ -62,7 +62,7 @@ sub GenerateHeader ($$\%) { while(<TEMPLATE>) { my $line = $_; while(($orig, $replace) = each %$keywords) { - $line =~ s/{{$orig}}/$replace/g; + $line =~ s/\{\{$orig\}\}/$replace/g; } # the first line is a comment specific to the template file, which we
