From d0209de76ab026a6dce4b1789900cccc0c620a3ad478b03bc461e3e67ff66d6f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 7 Mar 2012 09:47:32 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=3 --- libXpm.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libXpm.spec b/libXpm.spec index d9eaf93..24d2ae4 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -14,6 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + + Name: libXpm %define lname libXpm4 Version: 3.5.9 @@ -21,16 +24,16 @@ Release: 0 Summary: X Pixmap image file format library License: MIT Group: Development/Libraries/C and C++ -URL: http://xorg.freedesktop.org/ +Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXpm #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXpm/ Source: %name-%version.tar.bz2 -BuildRoot: %_tmppath/%name-%version-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool -BuildRequires: pkgconfig, pkgconfig(xorg-macros) >= 1.8, pkgconfig(xproto) -BuildRequires: pkgconfig(x11), pkgconfig(xt), pkgconfig(xext) -BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig pkgconfig(xorg-macros) >= 1.8 pkgconfig(xproto) +BuildRequires: pkgconfig(x11) pkgconfig(xext) pkgconfig(xt) +BuildRequires: pkgconfig(xextproto) %description libXpm facilitates working with XPM (X PixMap), a format for @@ -49,8 +52,8 @@ Summary: Development files for the X Pixmap image file format library Group: Development/Libraries/C and C++ Requires: %lname = %version # O/P added for 12.2 -Provides: xorg-x11-libXpm-devel = 7.6_%version-%release -Obsoletes: xorg-x11-libXpm-devel < 7.6_%version-%release +Provides: xorg-x11-libXpm-devel = 7.6_%version-%release +Obsoletes: xorg-x11-libXpm-devel < 7.6_%version-%release %description devel libXpm facilitates working with XPM (X PixMap), a format for @@ -60,11 +63,11 @@ This package contains the development headers for the library found in %lname. %package tools -Summary: Conversion utilities for X Pixmap (XPM) files -Group: Productivity/Graphics/Convertors +Summary: Conversion utilities for X Pixmap (XPM) files +Group: Productivity/Graphics/Convertors # O/P added for 12.2 -Provides: xorg-x11-libXpm = 7.6_%version-%release -Obsoletes: xorg-x11-libXpm < 7.6_%version-%release +Provides: xorg-x11-libXpm = 7.6_%version-%release +Obsoletes: xorg-x11-libXpm < 7.6_%version-%release %description tools The spxm tool converts XPM1/XPM2 files to XPM version 3. From 85efd263ca79fb61b90959d516f11b89206b47b3d81d036a4bb4e55fed235ad7 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 12 Apr 2012 10:44:55 +0000 Subject: [PATCH 2/2] Accepting request 113253 from home:vuntz:branches:X11:XOrg Update to 3.5.10 OBS-URL: https://build.opensuse.org/request/show/113253 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=4 --- libXpm-3.5.10.tar.bz2 | 3 +++ libXpm-3.5.9.tar.bz2 | 3 --- libXpm.changes | 8 ++++++++ libXpm.spec | 13 ++++++++----- 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 libXpm-3.5.10.tar.bz2 delete mode 100644 libXpm-3.5.9.tar.bz2 diff --git a/libXpm-3.5.10.tar.bz2 b/libXpm-3.5.10.tar.bz2 new file mode 100644 index 0000000..ea73bb1 --- /dev/null +++ b/libXpm-3.5.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735 +size 431310 diff --git a/libXpm-3.5.9.tar.bz2 b/libXpm-3.5.9.tar.bz2 deleted file mode 100644 index fafc791..0000000 --- a/libXpm-3.5.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e -size 383818 diff --git a/libXpm.changes b/libXpm.changes index 467cc8b..3623610 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 11 15:42:59 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.5.10: + + Compiler warning fixes + + Janitorial cleanups + + Build configuration improvements + ------------------------------------------------------------------- Sun Feb 12 01:08:12 UTC 2012 - jengelh@medozas.de diff --git a/libXpm.spec b/libXpm.spec index 24d2ae4..30b9c03 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -16,10 +16,9 @@ # - Name: libXpm %define lname libXpm4 -Version: 3.5.9 +Version: 3.5.10 Release: 0 Summary: X Pixmap image file format library License: MIT @@ -28,12 +27,16 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXpm #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXpm/ -Source: %name-%version.tar.bz2 +Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool -BuildRequires: pkgconfig pkgconfig(xorg-macros) >= 1.8 pkgconfig(xproto) -BuildRequires: pkgconfig(x11) pkgconfig(xext) pkgconfig(xt) +BuildRequires: pkgconfig +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xt) %description libXpm facilitates working with XPM (X PixMap), a format for