Accepting request 46160 from devel:libraries:c_c++

checked in (request 46160)

OBS-URL: https://build.opensuse.org/request/show/46160
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/neon?expand=0&rev=12

neon.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package neon (Version 0.29.3)
+# spec file for package neon (Version 0.28.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,31 +15,29 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
 
 Name:           neon
-Version:        0.29.3
+BuildRequires:  krb5-devel libexpat-devel libopenssl-devel zlib-devel
+Summary:        An HTTP and WebDAV Client Library
+Version:        0.28.4
 Release:        4
 License:        GPLv2+
-Summary:        An HTTP and WebDAV Client Library
-BuildRequires:  krb5-devel
-BuildRequires:  libexpat-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  libproxy-devel
-BuildRequires:  pkg-config
-BuildRequires:  zlib-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      neon-64bit
 %endif
-Url:            http://www.webdav.org/neon
 #
 Group:          Development/Libraries/Other
+Url:            http://www.webdav.org/neon
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://www.webdav.org/neon/neon-%{version}.tar.bz2
 Source2:        baselibs.conf
-# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         %{name}-0.28.4-bloat.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch1:         %{name}-0.28.4-CVE-2009-2473,2474.patch
+# http://lists.manyfish.co.uk/pipermail/neon-commits/2009-September/000827.html
+Patch2:         %{name}-openssl.patch
 
 %description
 neon is an HTTP and WebDAV client library with a C interface.
@@ -71,6 +69,7 @@ properties (PROPPATCH/PROPFIND)
 License:        GPLv2+
 Summary:        An HTTP and WebDAV Client Library
 Group:          Development/Libraries/Other
+Requires:       %{name} = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      neon-64bit
@@ -107,12 +106,7 @@ properties (PROPPATCH/PROPFIND)
 License:        GPLv2+
 Summary:        An HTTP and WebDAV Client Library
 Group:          Development/Libraries/Other
-Requires:       glibc-devel
-Requires:       libneon27 = %{version}
-# Drop the main package. It avoids the lib from being installed in different versions
-# and generally only contained coders doc anyhow.
-Provides:       neon = %{version}
-Obsoletes:      neon < %{version}
+Requires:       libneon27 = %{version} glibc-devel
 # renamed after openSUSE 10.3
 Provides:       neon-devel = 0.27
 Obsoletes:      neon-devel < 0.27
@@ -151,6 +145,8 @@ properties (PROPPATCH/PROPFIND)
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2 -p2
 
 %build
 rm -f aclocal.m4 ltmain.sh
@@ -162,30 +158,33 @@ sh autogen.sh
     --disable-static \
     --enable-warnings \
     --with-pic
-%{__make} %{?_smp_mflags}
+%{__make} %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=%{buildroot} docdir=%{_defaultdocdir}/%{name} install install-man install-html
-rm -f %{buildroot}%{_libdir}/*.la
+make DESTDIR=$RPM_BUILD_ROOT docdir=%{_defaultdocdir}/%{name} install install-man install-html
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %check
 # make check
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -n libneon27 -p /sbin/ldconfig
 
 %postun -n libneon27 -p /sbin/ldconfig
 
+%files
+%defattr(-,root,root)
+%doc doc/*.txt doc/html
+%doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+
 %files -n libneon27
 %defattr(-,root,root)
-%doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 %{_libdir}/*.so.27*
 
 %files -n libneon-devel
 %defattr(-,root,root)
-%doc %{_defaultdocdir}/%{name}
 %{_bindir}/neon-config
 %dir %{_includedir}/neon
 %{_includedir}/neon/*.h