diff --git a/expat.changes b/expat.changes index 8dd46f8..76f0754 100644 --- a/expat.changes +++ b/expat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 11 12:10:03 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Remove old ppc obsoletes/provides + ------------------------------------------------------------------- Tue Mar 26 13:10:01 UTC 2013 - mmeister@suse.com diff --git a/expat.spec b/expat.spec index a223fb0..6a57e18 100644 --- a/expat.spec +++ b/expat.spec @@ -1,7 +1,7 @@ # # spec file for package expat # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,26 +19,22 @@ Name: expat Version: 2.1.0 Release: 0 -Url: http://expat.sourceforge.net/ -# bug437293 -%ifarch ppc64 -Obsoletes: expat-64bit -%endif -# Summary: XML Parser Toolkit License: MIT Group: Development/Libraries/C and C++ +Url: http://expat.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: %{name}faq.html Source2: baselibs.conf Patch2: expat-visibility.patch Patch3: expat-alloc-size.patch Patch4: config-guess-sub-update.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.58 +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Expat is an XML parser library written in C. It is a stream-oriented @@ -48,11 +44,6 @@ parser might find in the XML document (like start tags). %package -n libexpat1 Summary: XML Parser Toolkit Group: Development/Libraries/C and C++ -# bug437293 -%ifarch ppc64 -Obsoletes: expat-64bit -%endif -# %description -n libexpat1 Expat is an XML parser library written in C. It is a stream-oriented @@ -78,7 +69,7 @@ in libexpat. %patch2 -p1 %patch3 %patch4 -cp %{S:1} . +cp %{SOURCE1} . rm -f examples/*.dsp %build @@ -87,13 +78,13 @@ autoreconf -fi make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=%{buildroot} install %{?_smp_mflags} rm doc/xmlwf.1 # remove .la file rm -f %{buildroot}%{_libdir}/libexpat.la %check -make check +make %{?_smp_mflags} check %post -n libexpat1 -p /sbin/ldconfig @@ -103,7 +94,7 @@ make check %defattr(-, root, root) %doc COPYING Changes README examples expatfaq.html %doc doc/expat.png doc/reference.html doc/style.css doc/valid-xhtml10.png -%doc %{_mandir}/man?/* +%{_mandir}/man?/* %{_bindir}/xmlwf %files -n libexpat1