Accepting request 143834 from graphics

Update libmin to 60, Added libjpeg-devel, libxml2-devel and pkgconfig(x11) as build requirements (forwarded request 143815 from adra)

OBS-URL: https://build.opensuse.org/request/show/143834
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netpbm?expand=0&rev=41

netpbm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Dec  2 14:44:51 UTC 2012 - asterios.dramis@gmail.com
+
+- Update libmin to 60.
+- Added libjpeg-devel, libxml2-devel and pkgconfig(x11) as build requirements.
+
 -------------------------------------------------------------------
 Wed Nov 21 08:25:24 UTC 2012 - pgajdos@suse.com
 

netpbm.spec

@@ -16,27 +16,17 @@
 #
 
 
-Name:           netpbm
-BuildRequires:  flex
-BuildRequires:  libjasper-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  python
-Provides:       pbmplus
-# bug437293
-%ifarch ppc64
-Obsoletes:      netpbm-64bit
-%endif
-#
 %define libmaj  11
-%define libmin  59
+%define libmin  60
 %define libver  %{libmaj}.%{libmin}
+
+Name:           netpbm
 Version:        10.60.3
 Release:        0
 Summary:        A Powerful Graphics Conversion Package
 License:        BSD-3-Clause and GPL-2.0+ and SUSE-IJG and MIT and SUSE-Public-Domain
 Group:          Productivity/Graphics/Convertors
-Url:            http://http://netpbm.sourceforge.net/
+Url:            http://netpbm.sourceforge.net/
 Source:         netpbm-%{version}-nohpcdtoppm-noppmtompeg.tar.bz2
 Source1:        netpbm-%{version}-documentation.tar.bz2
 Source2:        baselibs.conf
@@ -50,6 +40,25 @@ Patch2:         %{name}-missing-file-close.patch
 Patch3:         %{name}-tmpfile.patch 
 Patch4:         %{name}-security-code.patch 
 Patch5:         %{name}-security-scripts.patch 
+BuildRequires:  flex
+BuildRequires:  libjasper-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  python
+%if 0%{?suse_version} >= 1140
+BuildRequires:  pkgconfig(x11)
+%else
+BuildRequires:  xorg-x11-devel
+%endif
+Provides:       pbmplus
+# bug437293
+%ifarch ppc64
+Obsoletes:      netpbm-64bit
+%endif
+#
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libnetpbm%{libmaj}
 Summary:        Libraries for the NetPBM (NetPortableBitmap) Graphic Formats
@@ -146,8 +155,8 @@ install -m 644 converter/other/pnmtopalm/*.map \
 
 %files
 %defattr(-,root,root)
-%doc   README doc/* netpbm.sourceforge.net/doc
-%doc   pnmtopalm/
+%doc README doc/* netpbm.sourceforge.net/doc
+%doc pnmtopalm/
 %doc %{_mandir}/man1/*.gz
 %doc %{_mandir}/man3/*.gz
 %doc %{_mandir}/man5/*.gz
@@ -156,7 +165,8 @@ install -m 644 converter/other/pnmtopalm/*.map \
 
 %files -n libnetpbm%{libmaj}
 %defattr(-,root,root)
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so.%{libmaj}
+%{_libdir}/lib*.so.%{libver}
 
 %files -n libnetpbm-devel
 %defattr(-,root,root)