Hello community, here is the log from the commit of package libwmf for openSUSE:Factory checked in at 2014-06-01 18:58:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwmf (Old) and /work/SRC/openSUSE:Factory/.libwmf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwmf" Changes: -------- --- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes 2014-04-03 16:38:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2014-06-01 18:58:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 28 09:41:12 UTC 2014 - fstrba@suse.com + +- Clean spec file with spec-cleaner +- Do not distribute *.la files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwmf.spec ++++++ --- /var/tmp/diff_new_pack.nWjPQo/_old 2014-06-01 18:58:17.000000000 +0200 +++ /var/tmp/diff_new_pack.nWjPQo/_new 2014-06-01 18:58:17.000000000 +0200 @@ -16,20 +16,8 @@ # -Name: libwmf %define lname libwmf-0_2-7 -BuildRequires: gd-devel -BuildRequires: gtk2-devel -BuildRequires: libjpeg-devel -BuildRequires: libtiff-devel -BuildRequires: libxml2-devel -BuildRequires: update-desktop-files -BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-util-devel -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xt) -Provides: mswordvw:/usr/bin/wmftopng -Provides: wv:/usr/bin/wmftopng +Name: libwmf Version: 0.2.8.4 Release: 0 Summary: Utilities for Displaying and Converting Metafile Images @@ -38,12 +26,24 @@ Url: http://wvWare.sourceforge.net/ Source: http://downloads.sourceforge.net/project/wvware/%{name}/%{version}/%{name}-%{version}.tar.gz Source2: baselibs.conf -Patch: libwmf-%{version}-ia64.patch +Patch0: libwmf-%{version}-ia64.patch Patch1: libwmf-%{version}-fix.patch Patch2: libwmf-%{version}-config.patch Patch3: libwmf-%{version}-overflow-CVE-2006-3376.patch Patch4: libwmf-0.2.8.4-gd_libpng.patch Patch5: libwmf-0.2.8.4-bnc495842.patch +BuildRequires: gd-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libtiff-devel +BuildRequires: libxml2-devel +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-util-devel +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xt) +Provides: mswordvw:%{_bindir}/wmftopng +Provides: wv:%{_bindir}/wmftopng BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,34 +55,34 @@ Summary: Utilities for Displaying and Converting Metafile Images Group: Productivity/Graphics/Other # Prov/Obs added on 2011-11-22 (post openSUSE 12.1) -Provides: libwmf = %version-%release -Provides: wmf-utils = %version-%release -Obsoletes: libwmf < %version-%release -Obsoletes: wmf-utils < %version-%release +Provides: libwmf = %{version}-%{release} +Provides: wmf-utils = %{version}-%{release} +Obsoletes: libwmf < %{version}-%{release} +Obsoletes: wmf-utils < %{version}-%{release} %description tools These utilities read metafile images and can either display them using the X Window System or convert them to standard formats such as PNG, JPEG, PS, EPS, and more. -%package -n %lname +%package -n %{lname} Summary: Library for reading Metafile Images Group: System/Libraries -%description -n %lname +%description -n %{lname} This library reads metafile images. %package devel -Requires: %lname = %{version} -Requires: libwmf-gnome = %{version} -Provides: mswordvd:/usr/lib/libwmf.a -Provides: wv-devel:/usr/lib/libwmf.a Summary: Static libraries, header files and documentation for libwmf Group: Development/Libraries/C and C++ +Requires: %{lname} = %{version} Requires: libjpeg-devel Requires: libpng-devel Requires: libwmf +Requires: libwmf-gnome = %{version} Requires: xorg-x11-devel +Provides: mswordvd:%{_libexecdir}/libwmf.a +Provides: wv-devel:%{_libexecdir}/libwmf.a %description devel The libwmf-devel package contains the header files and static libraries @@ -99,10 +99,10 @@ %prep %setup -q -%patch -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 +%patch0 +%patch1 +%patch2 +%patch3 %patch4 %patch5 @@ -111,30 +111,31 @@ make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/usr/include/libwmf -make DESTDIR=$RPM_BUILD_ROOT \ +mkdir -p %{buildroot}%{_includedir}/libwmf +make DESTDIR=%{buildroot} \ wmfdocdir=%{_defaultdocdir}/libwmf \ wmfonedocdir=%{_defaultdocdir}/libwmf/caolan \ install -cp AUTHORS COPYING CREDITS ChangeLog README TODO $RPM_BUILD_ROOT/%{_defaultdocdir}/libwmf +find %{buildroot} -type f -name "*.la" -delete -print +cp AUTHORS COPYING CREDITS ChangeLog README TODO %{buildroot}/%{_defaultdocdir}/libwmf -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files tools %defattr(-,root,root) -/usr/bin/libwmf-fontmap -/usr/bin/wmf2eps -/usr/bin/wmf2fig -/usr/bin/wmf2gd +%{_bindir}/libwmf-fontmap +%{_bindir}/wmf2eps +%{_bindir}/wmf2fig +%{_bindir}/wmf2gd #/usr/bin/wmf2magick #/usr/bin/wmf2plot -/usr/bin/wmf2svg -/usr/bin/wmf2x +%{_bindir}/wmf2svg +%{_bindir}/wmf2x # # -/usr/share/libwmf +%{_datadir}/libwmf # %dir %{_defaultdocdir}/libwmf %doc %{_defaultdocdir}/libwmf/AUTHORS @@ -144,9 +145,9 @@ %doc %{_defaultdocdir}/libwmf/README %doc %{_defaultdocdir}/libwmf/TODO -%files -n %lname +%files -n %{lname} %defattr(-,root,root) -%_libdir/libwmf*-0.2.so.7* +%{_libdir}/libwmf*-0.2.so.7* %files gnome %defattr(-,root,root) @@ -155,11 +156,10 @@ %files devel %defattr(-,root,root) -/usr/bin/libwmf-config -/usr/include/libwmf +%{_bindir}/libwmf-config +%{_includedir}/libwmf %{_libdir}/libwmf*.so %{_libdir}/libwmf*.a -%{_libdir}/libwmf*.la %dir %{_libdir}/gtk-*/*/loaders %{_libdir}/gtk-*/*/loaders/*.*a # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org