- do minor spec file cleanup

This commit is contained in:
Ivana Varekova 2009-01-06 14:19:34 +00:00
parent 7b70eabfbe
commit f84e2c63f5
2 changed files with 23 additions and 6 deletions

12
gd-2.0.35-time.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up gd-2.0.35/Makefile.in.time gd-2.0.35/Makefile.in
--- gd-2.0.35/Makefile.in.time 2009-01-06 15:07:36.000000000 +0100
+++ gd-2.0.35/Makefile.in 2009-01-06 15:09:54.000000000 +0100
@@ -25,7 +25,7 @@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
+INSTALL = @INSTALL@ -p
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c

17
gd.spec
View File

@ -1,7 +1,7 @@
Summary: A graphics library for quick creation of PNG or JPEG images
Name: gd
Version: 2.0.35
Release: 6%{?dist}
Release: 7%{?dist}
Group: System Environment/Libraries
License: MIT
URL: http://www.libgd.org/Main_Page
@ -13,7 +13,8 @@ Patch5: gd-2.0.34-sparc64.patch
Patch6: gd-2.0.35-overflow.patch
Patch7: gd-2.0.35-AALineThick.patch
Patch8: gd-2.0.33-BoxBound.patch
Patch9: gd-2.0.34-fonts.patch
Patch9: gd-2.0.34-fonts.patch
Patch10: gd-2.0.35-time.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
@ -59,6 +60,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
%patch7 -p1 -b .AALineThick
%patch8 -p1 -b .bb
%patch9 -p1 -b .fonts
%patch10 -p1 -b .time
%build
%configure --disable-rpath
@ -66,9 +68,9 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
make install INSTALL='install -p' DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/libgd.la
rm $RPM_BUILD_ROOT/%{_libdir}/libgd.a
%clean
rm -rf $RPM_BUILD_ROOT
@ -80,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING README-JPEG.TXT index.html
%doc COPYING README-JPEG.TXT index.html NEWS
%{_libdir}/*.so.*
%files progs
@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/gdlib.pc
%changelog
* Tue Jan 6 2009 Ivana Varekova <varekova@redhat.com> - 2.0.35-7
- do minor spec file cleanup
* Mon Jul 21 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.35-6
- fix license tag (nothing in this is GPL)