- up to 0.11.5

Changed files:
    gdchart-make.patch -> 1.2
    gdchart.spec -> 1.2

diff --git a/gdchart-make.patch b/gdchart-make.patch
index 263a796aead4537eccf6f3644f61323273139394..386a0e33857cf8aa5525f7bcb3706c389c3493b0 100644 (file)
--- a/gdchart-make.patch
+++ b/gdchart-make.patch
@@ -1,5 +1,5 @@
---- gdchart0.11.4dev/makefile.orig     Tue Mar 11 04:03:06 2003
-+++ gdchart0.11.4dev/makefile  Wed Jul  2 13:53:07 2003
+--- gdchart0.11.5dev/Makefile.orig     Tue Mar 11 04:03:06 2003
++++ gdchart0.11.5dev/Makefile  Wed Jul  2 13:53:07 2003
 @@ -6,11 +6,11 @@
  # ----- build path -----
  GDC_INCL=./
@@ -15,18 +15,19 @@
  
  # INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
  
-@@ -18,9 +18,8 @@
+@@ -18,9 +18,9 @@
  # GDChart requires the gd library - www.boutell.com/gd/
- # libgd 1.8.4 or better is required.  Don't use 2.0.0
+ # gd 2.0.28 or better is required (GIF support has returned to libgd)
  # if it's not installed in a standard location edit these lines for your installation
--GD_INCL=../gd-1.8.4/
--GD_LD=../gd-1.8.4/
--GD_LIB=libgd.a
-+GD_INCL=/usr/include
+-GD_INCL=/usr/local/include/
+-GD_LD=/usr/local/lib/
+-GD_LIB=libgd.so
++GD_INCL=/usr/include/
++GD_LD=/usr/lib/
 +GD_LIB=-lgd
- # if you're using gd2.x, use these lines
- # (it's typically built as a shared lib)
- # GD_INCL  = ../gd-2.0.0/
+ # a static libgd is also available
+ # GD_LIB=libgd.a
+ 
 @@ -66,7 +65,7 @@
  # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LD) -Xlinker -rpath -Xlinker $(ZLIB_LD)
  
@@ -36,7 +37,7 @@
  
  # --- compile the samples ---
  gdc_pie_samp.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie_samp.c
-@@ -82,57 +81,55 @@
+@@ -79,54 +79,51 @@
        $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c
  
  # --- link the samples ---
@@ -51,7 +52,7 @@
  
 -gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -      $(CC) -o gdc_samp2 \
--                       gdc.o gdchart.o price_conv.o gifencode.o \
+-                       gdc.o gdchart.o price_conv.o \
 +gdc_samp2: $(GDC_LD)libgdc.la gdc_samp2.o
 +      libtool --mode=link $(CC) -o gdc_samp2 \
                         gdc_samp2.o \
@@ -61,7 +62,7 @@
  
 -gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -      $(CC) -o gdc_pie_samp \
--                       gdc.o gdc_pie.o price_conv.o gifencode.o \
+-                       gdc.o gdc_pie.o price_conv.o \
 +gdc_pie_samp: $(GDC_LD)libgdc.la gdc_pie_samp.o
 +      libtool --mode=link $(CC) -o gdc_pie_samp \
                         gdc_pie_samp.o \
@@ -71,7 +72,7 @@
  
 -ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
 -      $(CC) -o ft_samp \
--                       gdc.o gdchart.o price_conv.o gifencode.o \
+-                       gdc.o gdchart.o price_conv.o \
 +ft_samp: $(GDC_LD)libgdc.la ft_samp.o
 +      libtool --mode=link $(CC) -o ft_samp \
                         ft_samp.o \
@@ -80,13 +81,8 @@
 +                       libgdc.la -lgd -lz -lpng $(LIBS) -lm
  
  # --- compile the lib ---
--gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)gifencode.h $(GDC_INCL)array_alloc.h
-+gdc.h: $(GDC_INCL)gifencode.h $(GDC_INCL)array_alloc.h
- 
--gifencode.o: gifencode.c gifencode.h $(GDC_INCL)gdc.h
--      $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c
-+gifencode.lo: gifencode.c gifencode.h $(GDC_INCL)gdc.h
-+      libtool --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c
+-gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)array_alloc.h
++gdc.h: $(GDC_INCL)array_alloc.h
  
 -price_conv.o: price_conv.c
 -      $(CC) $(CFLAGS) -c price_conv.c
@@ -113,30 +109,29 @@
 +array_alloc.lo: array_alloc.c array_alloc.h
 +      libtool --mode=compile $(CC) $(CFLAGS) -c array_alloc.c
  
--libgdc.a: gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
--      ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o gifencode.o array_alloc.o
+-libgdc.a: price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
+-      ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o array_alloc.o
 -      ranlib libgdc.a
-+# gifencode.lo not always needed (depends on GIF support in libgd)
-+libgdc.la: $(GIFENCODE_LO) price_conv.lo gdc.lo gdc_pie.lo gdchart.lo array_alloc.lo
++libgdc.la: price_conv.lo gdc.lo gdc_pie.lo gdchart.lo array_alloc.lo
 +      libtool --mode=link $(CC) $(LDFLAGS) -o libgdc.la -rpath $(PREFIX_LIB) -lgd \
-+              gdc.lo gdchart.lo gdc_pie.lo price_conv.lo $(GIFENCODE_LO) array_alloc.lo
++      gdc.lo gdchart.lo gdc_pie.lo price_conv.lo array_alloc.lo
  
  # --- supporting libraries ---
  # should be compile & installed separately
-@@ -140,11 +140,12 @@
+@@ -134,11 +131,12 @@
  #     cd $(GD_LD) ; make -f Makefile $(GD_LIB)
  
  # ----- install -----
--install: gdc.h gdchart.h gdcpie.h gifencode.h libgdc.a
--      cp gdc.h  gdchart.h  gdcpie.h  gifencode.h $(PREFIX_INC)/
+-install: gdc.h gdchart.h gdcpie.h libgdc.a
+-      cp gdc.h  gdchart.h  gdcpie.h $(PREFIX_INC)/
 -      cp libgdc.a $(PREFIX_LIB)/
-+install: gdc.h gdchart.h gdcpie.h gifencode.h libgdc.la
++install: gdc.h gdchart.h gdcpie.h libgdc.la
 +      install -d $(DESTDIR)$(PREFIX_INC) $(DESTDIR)$(PREFIX_LIB)
-+      cp gdc.h  gdchart.h  gdcpie.h  $(GIFENCODE_H) $(DESTDIR)$(PREFIX_INC)
++      cp gdc.h  gdchart.h  gdcpie.h  $(DESTDIR)$(PREFIX_INC)
 +      libtool --mode=install install libgdc.la $(DESTDIR)$(PREFIX_LIB)
  
  # --- clean ---
  clean:
 -      rm -f *.o *.a gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
-+      rm -f *.o *.la gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
++      rm -f *.lo *.la gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
  

diff --git a/gdchart.spec b/gdchart.spec
index 35fcaaaed9609a450983a2666490dad2135bbada..3742225d8b428275c8487e06b86976b84b8841fd 100644 (file)
--- a/gdchart.spec
+++ b/gdchart.spec
@@ -1,19 +1,21 @@
 Summary:       GD-based chart library
 Summary(pl):   Oparta na GD biblioteka do wykresów
 Name:          gdchart
-Version:       0.11.4
+Version:       0.11.5
 Release:       1
 License:       BSD-like
 Group:         Libraries
 Source0:       http://www.fred.net/brv/chart/%{name}%{version}dev.tar.gz
-# Source0-md5: eb3db4185f21185a89ae6f7cba49c404
+# Source0-md5: a4af7bc927d8b88934da56fce10a7a3c
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-extern.patch
 URL:           http://www.fred.net/brv/chart/
 BuildRequires: freetype-devel >= 2.0.0
-BuildRequires: gd-devel(gif) >= 1.8.4
+BuildRequires: gd-devel(gif) >= 2.0.28
 BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
 BuildRequires: libtool
+BuildRequires: zlib-devel
 Requires:      gd(gif)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,13 +57,15 @@ Statyczna biblioteka gdchart.
 %build
 %{__make} \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags}" \
+       PREFIX_LIB="%{_libdir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       PREFIX_LIB="%{_libdir}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README.txt
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 
 %files devel