OBS User unknown 2008-04-11 22:06:25 +00:00 committed by Git OBS Bridge
parent ffbe05a8ba
commit c12de8b5e8
3 changed files with 51 additions and 35 deletions

View File

@ -1,6 +1,6 @@
--- configure.in.orig 2003-07-09 21:24:53.000000000 +0200 --- configure.in
+++ configure.in 2004-02-16 12:01:00.000000000 +0100 +++ configure.in
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@ AC_PREREQ(1.12)
AC_REVISION($Revision: 1.106 $) AC_REVISION($Revision: 1.106 $)
AC_CONFIG_AUX_DIR(.) AC_CONFIG_AUX_DIR(.)
@ -9,3 +9,12 @@
AC_SUBST(VERSION) AC_SUBST(VERSION)
AM_INIT_AUTOMAKE(zimg, $VERSION) AM_INIT_AUTOMAKE(zimg, $VERSION)
@@ -69,7 +69,7 @@ AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
-if ${CONFIG_SHELL} ./libtool --features | grep "enable static" >/dev/null; then
+if if test -x libtool; then ${CONFIG_SHELL} ./libtool --features; else libtool --features; fi | grep "enable static" >/dev/null; then
STATIC=-static
else
STATIC=

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 11 14:44:25 CEST 2008 - schwab@suse.de
- Work around broken configure script.
- Use autoreconf.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 21:43:46 CET 2006 - mls@suse.de Wed Jan 25 21:43:46 CET 2006 - mls@suse.de

View File

@ -1,29 +1,30 @@
# #
# spec file for package zimg (Version 5.0.0) # spec file for package zimg (Version 5.0.0)
# #
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
# Please submit bugfixes or comments via http://bugs.opensuse.org # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild # norootforbuild
Name: zimg
BuildRequires: freetype2-devel gd-devel libpng-devel libtiff-devel xorg-x11 xorg-x11-devel Name: zimg
License: Other License(s), see package BuildRequires: freetype2-devel gd-devel libpng-devel libtiff-devel xorg-x11 xorg-x11-devel
Group: Productivity/Graphics/Visualization/Graph License: BSD 3-Clause
Requires: gd >= 1.8.3 Group: Productivity/Graphics/Visualization/Graph
Autoreqprov: on Requires: gd >= 1.8.3
Version: 5.0.0 AutoReqProv: on
Release: 1 Version: 5.0.0
Source: %{name}-%{version}.tar.bz2 Release: 160
Patch: %{name}-%{version}.patch Source: %{name}-%{version}.tar.bz2
URL: http://sourceforge.net/projects/zimg/ Patch: %{name}-%{version}.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/zimg/
Summary: display 2-D data of arbitrary format BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: ImageMagick Summary: display 2-D data of arbitrary format
Requires: ImageMagick
%description %description
zimg generates png images from arbitrary formatted f(x,y) data. Both zimg generates png images from arbitrary formatted f(x,y) data. Both
@ -45,9 +46,7 @@ Authors:
%build %build
%define prefix /usr/ %define prefix /usr/
aclocal autoreconf -fi
automake -a
autoconf
CFLAGS="$RPM_OPT_FLAGS" \ CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS" \
./configure --mandir=%{_mandir} \ ./configure --mandir=%{_mandir} \
@ -59,7 +58,6 @@ CXXFLAGS="$RPM_OPT_FLAGS" \
make xpm_libs="-L/usr/X11R6/%{_lib} -lXpm -lX11" make xpm_libs="-L/usr/X11R6/%{_lib} -lXpm -lX11"
%install %install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT/usr/include/zimg.h rm -f $RPM_BUILD_ROOT/usr/include/zimg.h
@ -72,28 +70,31 @@ rm -rf $RPM_BUILD_ROOT
/usr/bin/zimg /usr/bin/zimg
/usr/share/man/man1/zimg* /usr/share/man/man1/zimg*
%changelog -n zimg %changelog
* Wed Jan 25 2006 - mls@suse.de * Fri Apr 11 2008 schwab@suse.de
- Work around broken configure script.
- Use autoreconf.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Mon Nov 14 2005 - lmichnovic@suse.cz * Mon Nov 14 2005 lmichnovic@suse.cz
- update to verison 5.0.0 - update to verison 5.0.0
- Default graphical output application changed from xv to display (ImageMagick) due to licence of xv. - Default graphical output application changed from xv to display (ImageMagick) due to licence of xv.
- Added Requires: ImageMagick. - Added Requires: ImageMagick.
* Mon Feb 16 2004 - ltinkl@suse.cz * Mon Feb 16 2004 ltinkl@suse.cz
- update to 4.22.0 - update to 4.22.0
* Sun Jan 11 2004 - adrian@suse.de * Sun Jan 11 2004 adrian@suse.de
- add %%defattr - add %%defattr
* Tue May 27 2003 - ro@suse.de * Tue May 27 2003 ro@suse.de
- remove unpackaged files from buildroot - remove unpackaged files from buildroot
* Mon Feb 17 2003 - tcrhak@suse.cz * Mon Feb 17 2003 tcrhak@suse.cz
- update to version 4.19.1 - update to version 4.19.1
* Fri Apr 26 2002 - tcrhak@suse.cz * Fri Apr 26 2002 tcrhak@suse.cz
- fixed to build with lib64 - fixed to build with lib64
* Fri Feb 01 2002 - ro@suse.de * Fri Feb 01 2002 ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages> - changed neededforbuild <libpng> to <libpng-devel-packages>
* Wed Mar 21 2001 - pblaha@suse.cz * Wed Mar 21 2001 pblaha@suse.cz
- fix needfor build for freetype2 - fix needfor build for freetype2
* Thu Jan 25 2001 - pblaha@suse.cz * Thu Jan 25 2001 pblaha@suse.cz
- update on lates stable 4.5.0 - update on lates stable 4.5.0
* Mon Dec 18 2000 - pblaha@suse.cz * Mon Dec 18 2000 pblaha@suse.cz
- create this package - create this package