diff --git a/gd.changes b/gd.changes index 7aaaee3..be8aa43 100644 --- a/gd.changes +++ b/gd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 1 15:32:40 UTC 2016 - pgajdos@suse.com + +- add missing config/getver.pl [bsc#965190] + ------------------------------------------------------------------- Tue May 12 14:11:33 UTC 2015 - joerg.lorenzen@ki.tng.de diff --git a/gd.spec b/gd.spec index 92d9c56..803326c 100644 --- a/gd.spec +++ b/gd.spec @@ -1,7 +1,7 @@ # # spec file for package gd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Group: System/Libraries Url: http://libgd.bitbucket.org/ Source: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz Source1: baselibs.conf +Source2: getver.pl # to be upstreamed, gdlib-config --libs to return the same as pkg-config --libs gdlib Patch0: gd-config.patch # might be upstreamed, but could be suse specific also (/usr/share/fonts/Type1 font dir) @@ -97,6 +98,10 @@ the formats accepted for inline images by most browsers. %patch4 %build +# this file is errorneously forgotten from the tarball +# remove in next release to 2.1.1 +cp %{SOURCE2} config/getver.pl +perl config/getver.pl autoreconf -fiv # without-x -- useless switch which just mangles cflags %configure \ diff --git a/getver.pl b/getver.pl new file mode 100644 index 0000000..b44b81e --- /dev/null +++ b/getver.pl @@ -0,0 +1,42 @@ +#!/usr/bin/env perl + +# Simple script to extract the version number parts from src/gd.h. If +# called with the middle word of the version macro, it prints the +# value of that macro. If called with no argument, it outputs a +# human-readable version string. This must be run in the project +# root. It is used by configure.ac and docs/naturaldocs/run_docs.sh. + +use strict; + +my $key = shift; +my @version_parts = (); + +open FH, ") { + next unless m{version605b5d1778}; + next unless /^#define\s+GD_([A-Z0-9]+)_VERSION+\s+(\S+)/; + my ($lk, $lv) = ($1, $2); + if ($lk eq $key) { + chomp $lv; + $lv =~ s/"//g; + + print $lv; # no newline + exit(0); # success! + } + + push @version_parts, $lv if (!$key); +} + +close(FH); + +if (scalar @version_parts == 4) { + my $result = join(".", @version_parts[0..2]); + $result .= $version_parts[3]; + $result =~ s/"//g; + print $result; + exit(0); +} + +exit(1); # failure