[packages/psiconv] - up to 0.9.8

baggins baggins at pld-linux.org
Sun Jun 9 20:48:48 CEST 2013


commit cbedd125248b0a5422a6d4ef5460fa3c08dca537
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 9 20:48:39 2013 +0200

    - up to 0.9.8

 psiconv-gcc34.patch | 42 ------------------------------------------
 psiconv.spec        | 12 +++++-------
 2 files changed, 5 insertions(+), 49 deletions(-)
---
diff --git a/psiconv.spec b/psiconv.spec
index c995c7a..c4d50fa 100644
--- a/psiconv.spec
+++ b/psiconv.spec
@@ -1,14 +1,13 @@
 Summary:	Psion 5 data format library
 Summary(pl.UTF-8):	Biblioteka obsługi plików Psion 5
 Name:		psiconv
-Version:	0.9.7
-Release:	9
+Version:	0.9.8
+Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://huizen.dds.nl/~frodol/psiconv/%{name}-%{version}.tar.gz
-# Source0-md5:	1a14f0e5a047d136348b6c0e19051289
-Patch0:		%{name}-gcc34.patch
-URL:		http://huizen.dds.nl/~frodol/psiconv/
+Source0:	http://software.frodo.looijaard.name/psiconv/files/%{name}-%{version}.tar.gz
+# Source0-md5:	8d7548e3c6b9cd408544736133728acd
+URL:		http://software.frodo.looijaard.name/psiconv/
 BuildRequires:	ImageMagick-devel
 BuildRequires:	automake
 BuildRequires:	bc
@@ -61,7 +60,6 @@ Statyczna biblioteka psiconv.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
diff --git a/psiconv-gcc34.patch b/psiconv-gcc34.patch
deleted file mode 100644
index 37e7b02..0000000
--- a/psiconv-gcc34.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur psiconv-0.9.6/program/psiconv/gen_html4.c psiconv-0.9.6-fixed/program/psiconv/gen_html4.c
---- psiconv-0.9.6/program/psiconv/gen_html4.c	2004-02-04 13:17:38.000000000 +0100
-+++ psiconv-0.9.6-fixed/program/psiconv/gen_html4.c	2004-05-29 19:01:40.000000000 +0200
-@@ -317,7 +317,7 @@
- }
-                                                                                 
- 
--static struct fileformat_s ffs[] =
-+static struct fileformat_s psiconv_ffs[] =
-   {
-     {
-       "HTML4",
-@@ -337,6 +337,6 @@
- void init_html4(void)
- {
-   int i;
--  for (i = 0; ffs[i].name; i++)
--    psiconv_list_add(fileformat_list,ffs+i);
-+  for (i = 0; psiconv_ffs[i].name; i++)
-+    psiconv_list_add(fileformat_list,psiconv_ffs+i);
- }
-diff -Nur psiconv-0.9.6/program/psiconv/gen_xhtml.c psiconv-0.9.6-fixed/program/psiconv/gen_xhtml.c
---- psiconv-0.9.6/program/psiconv/gen_xhtml.c	2004-02-04 12:26:54.000000000 +0100
-+++ psiconv-0.9.6-fixed/program/psiconv/gen_xhtml.c	2004-05-29 19:01:46.000000000 +0200
-@@ -719,7 +719,7 @@
- }
-                                                                                 
- 
--static struct fileformat_s ffs[] =
-+static struct fileformat_s psiconv_ffs[] =
-   {
-     {
-       "XHTML",
-@@ -739,6 +739,6 @@
- void init_xhtml(void)
- {
-   int i;
--  for (i = 0; ffs[i].name; i++)
--    psiconv_list_add(fileformat_list,ffs+i);
-+  for (i = 0; psiconv_ffs[i].name; i++)
-+    psiconv_list_add(fileformat_list,psiconv_ffs+i);
- }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/psiconv.git/commitdiff/cbedd125248b0a5422a6d4ef5460fa3c08dca537



More information about the pld-cvs-commit mailing list