[packages/SFST] - new Source0 URL, updated to 1.4.7c - removed obsolete build patch

qboosh qboosh at pld-linux.org
Sat Sep 3 08:00:29 CEST 2016


commit d033a684d323dd0ab9074fab7952223bb08b4b51
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 3 08:01:47 2016 +0200

    - new Source0 URL, updated to 1.4.7c
    - removed obsolete build patch

 SFST.spec   | 17 +++++++----------
 build.patch | 16 ----------------
 2 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/SFST.spec b/SFST.spec
index 9304245..f3818f8 100644
--- a/SFST.spec
+++ b/SFST.spec
@@ -1,13 +1,13 @@
 Summary:	Stuttgart Finite State Transducer Tools
 Summary(pl.UTF-8):	Stuttgart Finite State Transducer Tools - narzędzia do automatów skończonych
 Name:		SFST
-Version:	1.4.6g
-Release:	2
+Version:	1.4.7c
+Release:	1
 License:	GPL v2+
 Group:		Development/Tools
-Source0:	ftp://ftp.ims.uni-stuttgart.de/pub/corpora/SFST/%{name}-%{version}.tar.gz
-# Source0-md5:	574f124731ab1b87696fdd9b8a6e4a7d
-Patch0:		build.patch
+#Source0Download: http://www.cis.uni-muenchen.de/~schmid/tools/SFST/
+Source0:	http://www.cis.uni-muenchen.de/~schmid/tools/SFST/data/%{name}-%{version}.tar.gz
+# Source0-md5:	34d220f3c7216094653ddc82924b00e2
 URL:		http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html
 BuildRequires:	bison
 BuildRequires:	flex
@@ -55,7 +55,6 @@ Pliki nagłówkowe biblioteki SFST.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 sed -i -e '/^	strip/d' src/Makefile
 
@@ -77,12 +76,10 @@ sed -i -e '/^	strip/d' src/Makefile
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C src install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_prefix}/
+	DESTDIR=$RPM_BUILD_ROOT%{_prefix}/
 
 %{__make} -C src maninstall \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_datadir}/
+	DESTDIR=$RPM_BUILD_ROOT%{_datadir}/
 
 install -D src/libsfst.so $RPM_BUILD_ROOT%{_libdir}/libsfst.so
 
diff --git a/build.patch b/build.patch
deleted file mode 100644
index 0dd11d4..0000000
--- a/build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- SFST/src/fst.C~	2012-02-20 13:34:34.000000000 +0100
-+++ SFST/src/fst.C	2013-12-03 08:43:28.287475829 +0100
-@@ -511,11 +511,11 @@
-     for( ArcsIter it(node->arcs()); it; it++ ) {
-       Arc *arc=it;
- 
--      NodeHashSet::iterator it=previous.insert(node).first;
-+      NodeHashSet::iterator itp=previous.insert(node).first;
-       path.push_back(arc->label());
-       enumerate_paths_node( arc->target_node(), path, previous, result );
-       path.pop_back();
--      previous.erase(it);
-+      previous.erase(itp);
-     }
-   }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/SFST.git/commitdiff/d033a684d323dd0ab9074fab7952223bb08b4b51



More information about the pld-cvs-commit mailing list