X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcabextract.git;a=blobdiff_plain;f=cabextract.spec;h=c075d7caeb4bfb64cbb84d381f58e90f7a3958ae;hp=8853660d3016defc0fc8a11bf7a7630b36d298ed;hb=HEAD;hpb=4805649b00de1b6b728540b231c9ef91d8492cfe

diff --git a/cabextract.spec b/cabextract.spec
index 8853660..be113cf 100644
--- a/cabextract.spec
+++ b/cabextract.spec
@@ -1,18 +1,17 @@
 Summary:	A program to extract Microsoft Cabinet files
-Summary(pl):	Program do rozpakowywania plików MS Cabinet
+Summary(pl.UTF-8):	Program do rozpakowywania plików MS Cabinet
 Name:		cabextract
-Version:	1.1
-Release:	4
-License:	GPL
+Version:	1.11
+Release:	1
+License:	GPL v2+
 Group:		Applications/Archiving
-Source0:	http://www.kyz.uklinux.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	f4b729c0be7d288660f4fc167de199a1
-Patch0:		%{name}-libmspack.patch
-URL:		http://www.kyz.uklinux.net/cabextract.php3
+Source0:	https://www.cabextract.org.uk/%{name}-%{version}.tar.gz
+# Source0-md5:	3f678e8cb815f26d73e9413913b20505
+URL:		https://www.cabextract.org.uk/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
-BuildRequires:	libmspack-devel
-BuildRequires:	libtool
+BuildRequires:	libmspack-devel >= 0.8alpha-5
+Requires:	libmspack >= 0.8alpha
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,40 +19,40 @@ Cabinet (.CAB) files are a form of archive, which Microsoft use to
 distribute their software, and things like Windows Font Packs. The
 cabextract program simply unpacks such files.
 
-%description -l pl
-Pliki Cabinet (.CAB) s± rodzajem archiwum, który Microsoft u¿ywa do
+%description -l pl.UTF-8
+Pliki Cabinet (.CAB) są rodzajem archiwum, który Microsoft używa do
 dystrybucji swojego oprogramowania i rzeczy typu Windows Font Pack.
-cabextract mo¿e takie pliki rozpakowaæ.
+cabextract może takie pliki rozpakować.
 
 %prep
 %setup -q
-%patch0 -p1
-rm -rf mspack
 
 %build
-cp -f /usr/share/automake/config.sub .
-%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	CPPFLAGS="%{rpmcppflags} -I/usr/include/libmspack" \
+	--with-external-libmspack
 %{__make}
 
+%{__make} check
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D doc/ja/cabextract.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1
+install -D doc/ja/cabextract.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/cabextract.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-%lang(ja) %{_mandir}/ja/man1*
+%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_bindir}/cabextract
+%{_mandir}/man1/cabextract.1*
+%lang(ja) %{_mandir}/ja/man1/cabextract.1*