Hello community, here is the log from the commit of package zimg for openSUSE:Factory checked in at 2015-05-02 21:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zimg (Old) and /work/SRC/openSUSE:Factory/.zimg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zimg" Changes: -------- --- /work/SRC/openSUSE:Factory/zimg/zimg.changes 2013-03-14 15:36:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zimg.new/zimg.changes 2015-05-02 21:35:29.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 27 16:20:47 UTC 2015 - mplus...@suse.com + +- Cleanup spec file with spec-cleaner +- Update dependencies +- Use url for source +- Remove _DATE_ and _TIME_ + +------------------------------------------------------------------- Old: ---- zimg-5.0.0.tar.bz2 New: ---- zimg-5.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zimg.spec ++++++ --- /var/tmp/diff_new_pack.X0ZEgt/_old 2015-05-02 21:35:30.000000000 +0200 +++ /var/tmp/diff_new_pack.X0ZEgt/_new 2015-05-02 21:35:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zimg # -# 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 @@ -17,6 +17,18 @@ Name: zimg +Version: 5.0.0 +Release: 0 +Summary: Display 2-D data of arbitrary format +License: BSD-3-Clause +Group: Productivity/Graphics/Visualization/Graph +Url: http://sourceforge.net/projects/zimg/ +Source0: http://sourceforge.net/projects/zimg/files/zimg/zimg-%{version}/%{name}-%{version}.tar.gz +Source1: %{name}.changes +Patch0: %{name}-%{version}.patch +Patch1: zimg-automake-1.13.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: freetype2-devel BuildRequires: gd-devel BuildRequires: libpng-devel @@ -24,18 +36,9 @@ BuildRequires: libtool BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel +Requires: ImageMagick Requires: gd >= 1.8.3 -Version: 5.0.0 -Release: 0 -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}.patch -Patch1: zimg-automake-1.13.patch -Url: http://sourceforge.net/projects/zimg/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Display 2-D data of arbitrary format -License: BSD-3-Clause -Group: Productivity/Graphics/Visualization/Graph -Requires: ImageMagick %description zimg generates png images from arbitrary formatted f(x,y) data. Both @@ -44,41 +47,34 @@ VLCM and contour graphics and lots of color maps. zimg is a fast converter. - - -Authors: --------- - Johannes Zellner <johan...@zellner.org> - %prep -%setup -%patch +%setup -q +%patch0 %patch1 -p1 +# Do not include build time +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE1}")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -name '*.[ch]' |\ + xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" %build -%define prefix /usr/ autoreconf -fi -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --mandir=%{_mandir} \ - --prefix=%{prefix} \ - --with-gd-includes=/usr/include/ \ +%configure \ + --with-gd-includes=%{_includedir}/ \ --with-x-viewer=display \ --with-gd-lib=%{_libdir} \ --with-jpeg-lib=%{_libdir} -make xpm_libs="-L/usr/X11R6/%{_lib} -lXpm -lX11" +make xpm_libs="-L/usr/X11R6/%{_lib} -lXpm -lX11" %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/usr/include/zimg.h - -%clean -rm -rf $RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -f %{buildroot}%{_includedir}/zimg.h %files %defattr(-,root,root) %doc README ChangeLog AUTHORS COPYING NEWS TODO -/usr/bin/zimg -/usr/share/man/man1/zimg* +%{_bindir}/zimg +%{_mandir}/man1/zimg* %changelog
