- updated dependencies

- adjusted column alignment in info patch
- License is LGPL v3 now
- release 2

diff --git a/dvipng-info.patch b/dvipng-info.patch
index 45b464cc557b936adc5f42c5b7130b4a8c13af9f..a623a7e4491c3c335cb9c29e4001a5cbdb53916f 100644 (file)
--- a/dvipng-info.patch
+++ b/dvipng-info.patch
@@ -10,8 +10,8 @@ diff -burN dvipng-1.1.orig/dvipng.texi dvipng-1.1/dvipng.texi
  @direntry
 -* DVI-to-PNG: (dvipng).              Translating TeX DVI files to Portable Network Graphics (PNG).
 -* dvipng: (dvipng).                  A DVI-to-PNG translator.
  @direntry
 -* DVI-to-PNG: (dvipng).              Translating TeX DVI files to Portable Network Graphics (PNG).
 -* dvipng: (dvipng).                  A DVI-to-PNG translator.

-+* DVI-to-PNG: (dvipng).              Translating TeX DVI files to PNG
-+* dvipng: (dvipng).                  A DVI-to-PNG translator
++* DVI-to-PNG: (dvipng).                       Translating TeX DVI files to PNG
++* dvipng: (dvipng).                   A DVI-to-PNG translator

  @end direntry
  
  @finalout
  @end direntry
  
  @finalout

diff --git a/dvipng.spec b/dvipng.spec
index dcf962b51ce700acb2dc3f36cf13a87fa6d15c0b..43e5d7a27822984ab9ff705c290fa9995fbb2dff 100644 (file)
--- a/dvipng.spec
+++ b/dvipng.spec
@@ -2,18 +2,20 @@ Summary:      Convert DVI files to PNG
 Summary(pl.UTF-8):     Konwersja plików DVI do PNG
 Name:          dvipng
 Version:       1.15
 Summary(pl.UTF-8):     Konwersja plików DVI do PNG
 Name:          dvipng
 Version:       1.15

-Release:       1
-License:       GPL v2
-Group:         Applications/Console
+Release:       2
+License:       LGPL v3
+Group:         Applications/Graphics

 Source0:       http://downloads.sourceforge.net/dvipng/%{name}-%{version}.tar.gz
 # Source0-md5: c82043f4a366a560bb87fd9eafb6ef2f
 Patch0:                %{name}-info.patch
 URL:           http://sourceforge.net/projects/dvipng/
 Source0:       http://downloads.sourceforge.net/dvipng/%{name}-%{version}.tar.gz
 # Source0-md5: c82043f4a366a560bb87fd9eafb6ef2f
 Patch0:                %{name}-info.patch
 URL:           http://sourceforge.net/projects/dvipng/

-BuildRequires: freetype-devel
-BuildRequires: gd-devel
+BuildRequires: freetype-devel >= 2
+BuildRequires: gd-devel >= 2.0.28

 BuildRequires: kpathsea-devel
 BuildRequires: kpathsea-devel

+BuildRequires: libpng-devel

 BuildRequires: texinfo
 BuildRequires: texinfo

-BuildRequires: texinfo-texi2dvi
+BuildRequires: zlib-devel
+Requires:      gd >= 2.0.28

 Conflicts:     texlive
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Conflicts:     texlive
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -51,15 +53,17 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post  -p      /sbin/postshell
+%post  -p /sbin/postshell

 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 -/usr/sbin/fix-info-dir -c %{_infodir}
 

-%postun        -p      /sbin/postshell
+%postun        -p /sbin/postshell

 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README RELEASE
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README RELEASE

-%attr(755,root,root) %{_bindir}/dvi*
-%{_mandir}/man1/*
-%{_infodir}/*.info*
+%attr(755,root,root) %{_bindir}/dvigif
+%attr(755,root,root) %{_bindir}/dvipng
+%{_mandir}/man1/dvigif.1*
+%{_mandir}/man1/dvipng.1*
+%{_infodir}/dvipng.info*