commit 5a9f58e2585dcb2d9a5a7636a7cd6e5f8689ee73
Author: Christopher Meng <rpm at cicku.me>
Date: Wed Aug 28 20:39:42 2013 +0800
New version with bundled libraries fix.
.gitignore | 1 +
joyce.spec | 27 ++++++++++++++++++---------
sources | 2 +-
3 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2db14bd..ba7acc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/joyce-2.2.5b.tar.gz
+/joyce-2.2.6.tar.gz
diff --git a/joyce.spec b/joyce.spec
index 7b878b5..d3172ac 100644
--- a/joyce.spec
+++ b/joyce.spec
@@ -1,12 +1,14 @@
Name: joyce
-Version: 2.2.5
-Release: 2%{?dist}
+Version: 2.2.6
+Release: 1%{?dist}
Summary: Amstrad PCW and PCW16 Emulator
License: GPLv2+
URL: http://www.seasip.info/Unix/Joyce
-Source0: http://www.seasip.info/Unix/Joyce/%{name}-%{version}b.tar.gz
+Source0: http://www.seasip.info/Unix/Joyce/%{name}-%{version}.tar.gz
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: lib765-devel
+BuildRequires: libdsk-devel
BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
@@ -24,11 +26,15 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
-%setup -qn %{name}-%{version}b
+%setup -q
%build
autoreconf -fiv
-%configure --enable-shared --disable-static
+%configure --enable-shared \
+ --disable-static \
+ --with-system-libdsk \
+ --with-system-lib765
+
make %{?_smp_mflags}
%install
@@ -41,17 +47,20 @@ find %{buildroot} -name '*.*a' -delete -print
%files
%doc AUTHORS ChangeLog COPYING README TODO Docs/*.pdf
-%{_bindir}/*
+%{_bindir}/xanne
+%{_bindir}/xjoyce
%{_datadir}/Joyce
-%{_libdir}/*.so.*
+%{_libdir}/liblink.so.*
%files devel
%{_includedir}/cpmredir.h
-%{_includedir}/765.h
%{_includedir}/liblink.h
-%{_libdir}/*.so
+%{_libdir}/liblink.so
%changelog
+* Mon Aug 26 2013 Christopher Meng <rpm at cicku.me> - 2.2.6-1
+- New version with bundled libraries fix.
+
* Tue Jul 23 2013 Christopher Meng <rpm at cicku.me> - 2.2.5-2
- Fix the license.
- Split out data subpackage.
diff --git a/sources b/sources
index fbf8c3e..0881766 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7788413aad9900d6feef869e53333ad4 joyce-2.2.5b.tar.gz
+69cd5bfa30b91369fadb4899caa590ba joyce-2.2.6.tar.gz