- updated to 0.1.0, removed obsolete gfvs patch and package (dropped, added Obsoletes)

Changed files:
    fvs.spec -> 1.3

diff --git a/fvs.spec b/fvs.spec
index 8d1ad55dc6c6ed7acba9c62a0a01be431191b28b..1db15872ca1cc0ff57fa14a3fc76ecb90fbc431e 100644 (file)
--- a/fvs.spec
+++ b/fvs.spec
@@ -1,20 +1,16 @@
 Summary:       Fingerprint Verification System
 Summary(pl):   Fingerprint Verifycation System - system weryfikacji odcisków palców
 Name:          fvs
-Version:       0.0.9
+Version:       0.1.0
 Release:       1
 Epoch:         1
 License:       MPL 1.1
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/fvs/%{name}-%{version}.tar.bz2
-# Source0-md5: f886afb23665212a0b3e7abcd5b10225
-Patch0:                %{name}-gfvs.patch
+# Source0-md5: dba7993ac4d3a21c70ce058e34dac7b3
 URL:           http://fvs.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gtk+2-devel >= 2.0.0
-BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: libtool
+BuildRequires: ImageMagick-devel
+Obsoletes:     fvs-gfvs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,40 +48,10 @@ Static FVS library.
 %description static -l pl
 Statyczna biblioteka FVS.
 
-%package gfvs
-Summary:       GUI for FVS
-Summary(pl):   Graficzny interfejs do FVS
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}
-
-%description gfvs
-GUI for FVS.
-
-%description gfvs -l pl
-Graficzny interfejs do FVS.
-
 %prep
 %setup -q
-%patch -p1
-
-ln -sf ../../include gfvs/src/fvs
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-%{__make}
-
-cd gfvs
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-# no -f here
-automake -a -c --foreign
 %configure
 %{__make}
 
@@ -95,9 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install -C gfvs \
-       DESTDIR=$RPM_BUILD_ROOT
-
 rm -rf doc/images/.xvpics
 # man3 pages not installed because of filenames (use HTML docs instead)
 
@@ -123,7 +86,3 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-
-%files gfvs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gfvs