[packages/libxaw3dxft] - updated to 1.6.2c (new soname; compatible with Xaw3d 1.6.x) - removed obsolete link,pkgconfdir pat

[qboosh]

commit d684b467d20624806653f72dbf311fe5cbdd4827
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jul 21 18:00:52 2014 +0200

    - updated to 1.6.2c (new soname; compatible with Xaw3d 1.6.x)
    - removed obsolete link,pkgconfdir patches

 libxaw3dxft-link.patch       | 10 ----------
 libxaw3dxft-pkgconfdir.patch | 14 --------------
 libxaw3dxft.spec             | 37 ++++++++++++++++++++++---------------
 3 files changed, 22 insertions(+), 39 deletions(-)
---
diff --git a/libxaw3dxft.spec b/libxaw3dxft.spec
index 610b6bd..0fd88f9 100644
--- a/libxaw3dxft.spec
+++ b/libxaw3dxft.spec
@@ -5,24 +5,25 @@
 Summary:	Extended version of Xaw3d widgets library
 Summary(pl.UTF-8):	Rozszerzona wersja biblioteki widgetów Xaw3d
 Name:		libxaw3dxft
-Version:	1.3.3
-Release:	2
+Version:	1.6.2c
+Release:	1
 License:	MIT
 Group:		X11/Libraries
-Source0:	http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
-# Source0-md5:	d0bafeae76f3e50dbdce3e91bd149697
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-pkgconfdir.patch
+Source0:	http://downloads.sourceforge.net/sf-xpaint/libXaw3dXft-%{version}.tar.bz2
+# Source0-md5:	eaf7638fad4016abad4a3116485c8e67
 URL:		http://sourceforge.net/projects/sf-xpaint/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	libtool
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-util-util-macros >= 1.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,8 +45,14 @@ zastąpione odpowiednikami wykorzystującymi z FreeType.
 %package devel
 Summary:	Header files for Xaw3dxft library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Xaw3dxft
-Group:		Development/Libraries
+Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	fontconfig-devel
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXft-devel
+Requires:	xorg-lib-libXmu-devel
+Requires:	xorg-lib-libXt-devel
 
 %description devel
 Header files for Xaw3dxft library.
@@ -56,7 +63,7 @@ Pliki nagłówkowe biblioteki Xaw3dxft.
 %package static
 Summary:	Static Xaw3dxft library
 Summary(pl.UTF-8):	Statyczna biblioteka Xaw3dxft
-Group:		Development/Libraries
+Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -66,16 +73,17 @@ Static Xaw3dxft library.
 Statyczna biblioteka Xaw3dxft.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n libXaw3dXft-%{version}
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
+	--enable-arrow-scrollbars \
+	--enable-gray-stipples \
 	--enable-multiplane-pixmaps \
 	%{!?with_static_libs:--disable-static}
 
@@ -97,13 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc COPYING README
 %attr(755,root,root) %{_libdir}/libXaw3dxft.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXaw3dxft.so.7
+%attr(755,root,root) %ghost %{_libdir}/libXaw3dxft.so.8
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog
 %attr(755,root,root) %{_libdir}/libXaw3dxft.so
 %{_includedir}/X11/Xaw3dxft
 %{_pkgconfigdir}/libxaw3dxft.pc
diff --git a/libxaw3dxft-link.patch b/libxaw3dxft-link.patch
deleted file mode 100644
index 0fe52f1..0000000
--- a/libxaw3dxft-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libxaw3dxft-1.3.3/Makefile.am~	2012-02-05 16:38:19.000000000 +0100
-+++ libxaw3dxft-1.3.3/Makefile.am	2012-02-27 11:35:54.428339579 +0100
-@@ -38,6 +38,7 @@
- nodist_libXaw3dxft_la_SOURCES = $(BUILT_SOURCES)
- libXaw3dxft_la_includedir=$(includedir)/X11/Xaw3dxft
- libXaw3dxft_la_include_HEADERS = $(BASE_HDRS) $(EXTRA_INSTALL_HDRS)
-+libXaw3dxft_la_LIBADD = -lXmu -lXt -lXft -lXpm
- nodist_libXaw3dxft_la_include_HEADERS = Xaw3dP.h Xaw3dXft.h
- CLEANFILES = $(BUILT_SOURCES)
- EXTRA_DIST = laygram.y laylex.l app-defaults $(ORPHANS)
diff --git a/libxaw3dxft-pkgconfdir.patch b/libxaw3dxft-pkgconfdir.patch
deleted file mode 100644
index 316b484..0000000
--- a/libxaw3dxft-pkgconfdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libxaw3dxft-1.3.3/Makefile.am~	2012-02-27 11:36:25.248340970 +0100
-+++ libxaw3dxft-1.3.3/Makefile.am	2012-02-27 11:41:34.505021589 +0100
-@@ -68,9 +68,9 @@
- 	-rmdir X11
- 
- install-exec-hook:
--	-mkdir -p $(DESTDIR)/usr/lib/pkgconfig
-+	-mkdir -p $(DESTDIR)$(libdir)/pkgconfig
- 	cat libxaw3dxft.pc.in | sed -e "/VERSION/s//$(VERSION)/" > libxaw3dxft.pc
--	/bin/cp -p libxaw3dxft.pc $(DESTDIR)/usr/lib/pkgconfig
-+	/bin/cp -p libxaw3dxft.pc $(DESTDIR)$(libdir)/pkgconfig
- 	rm -f libxaw3dxft.pc
- 
- # -version-info current:revision:age
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxaw3dxft.git/commitdiff/d684b467d20624806653f72dbf311fe5cbdd4827