[packages/xorg-lib-libXaw] - updated to 1.0.13 - removed obsolete format-security patch - disable use of fop to generate (unpac

[qboosh]

commit def0e825609f109224936bece115e12d50df041c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed May 6 18:39:50 2015 +0200

    - updated to 1.0.13
    - removed obsolete format-security patch
    - disable use of fop to generate (unpackaged) pdf file

 format-security.patch | 11 -----------
 xorg-lib-libXaw.spec  | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/xorg-lib-libXaw.spec b/xorg-lib-libXaw.spec
index 297782e..249a8f7 100644
--- a/xorg-lib-libXaw.spec
+++ b/xorg-lib-libXaw.spec
@@ -5,13 +5,12 @@
 Summary:	X Athena Widgets library
 Summary(pl.UTF-8):	Biblioteka X Athena Widgets
 Name:		xorg-lib-libXaw
-Version:	1.0.12
-Release:	2
+Version:	1.0.13
+Release:	1
 License:	MIT
 Group:		X11/Libraries
 Source0:	http://xorg.freedesktop.org/releases/individual/lib/libXaw-%{version}.tar.bz2
-# Source0-md5:	7446f5fba888672aad068b29c0928ba3
-Patch0:		format-security.patch
+# Source0-md5:	e5e06eb14a608b58746bdd1c0bd7b8e3
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -78,7 +77,6 @@ Pakiet zawiera statyczną bibliotekę libXaw.
 
 %prep
 %setup -q -n libXaw-%{version}
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -88,7 +86,8 @@ Pakiet zawiera statyczną bibliotekę libXaw.
 %{__automake}
 
 %configure \
-	%{!?with_static_libs:--disable-static}
+	%{!?with_static_libs:--disable-static} \
+	--without-fop
 %{__make}
 
 %install
@@ -96,13 +95,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	pkgconfigdir=%{_pkgconfigdir} \
-	aclocaldir=%{_aclocaldir}
+	pkgconfigdir=%{_pkgconfigdir}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libXaw[67].so.[67]
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 
-%{__rm} -r $RPM_BUILD_ROOT{%{_docdir}/libXaw,%{_libdir}/libXaw[67].la}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXaw[67].la
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libXaw
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 6546052..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libXaw-1.0.11/src/DisplayList.c~	2012-06-02 05:31:37.000000000 +0200
-+++ libXaw-1.0.11/src/DisplayList.c	2012-12-13 14:31:01.364529613 +0100
-@@ -290,7 +290,7 @@
- 	}
-       if (fp)
- 	{
--	  snprintf(cname, fp - fname + 1, fname);
-+	  snprintf(cname, fp - fname + 1, "%s", fname);
- 	  memmove(fname, fp + 1, strlen(fp));
- 	  lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
- 	  if (!lc)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXaw.git/commitdiff/def0e825609f109224936bece115e12d50df041c