- updated to 0.2.7

- updated link patch

diff --git a/aribb25-link.patch b/aribb25-link.patch
index 8bd7975515ff5570066934e2eec51382afcf3242..18674346f13d0d049ff7f363d59a713bb5d0badf 100644 (file)
--- a/aribb25-link.patch
+++ b/aribb25-link.patch
@@ -1,11 +1,22 @@
---- aribb25-0.2.6/Makefile.am.orig     2014-10-21 21:08:42.000000000 +0200
-+++ aribb25-0.2.6/Makefile.am  2015-02-15 21:34:12.561661026 +0100
+--- aribb25-0.2.7/Makefile.am.orig     2016-10-07 22:28:32.405795581 +0200
++++ aribb25-0.2.7/Makefile.am  2016-10-08 08:38:17.052044517 +0200

 @@ -6,7 +6,7 @@
          src/b_cas_card_error_code.h src/multi2_error_code.h src/td.c \
          src/ts_section_parser_error_code.h src/arib_std_b25.h src/b_cas_card.h \
          src/multi2.h src/ts_common_types.h src/ts_section_parser.h src/aribb25api.h
 @@ -6,7 +6,7 @@
          src/b_cas_card_error_code.h src/multi2_error_code.h src/td.c \
          src/ts_section_parser_error_code.h src/arib_std_b25.h src/b_cas_card.h \
          src/multi2.h src/ts_common_types.h src/ts_section_parser.h src/aribb25api.h

--libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_CFLAGS)
-+libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_LIBS)
+-libaribb25_la_LIBADD = $(AM_LIBS) $(pcsclite_CFLAGS) $(PCSC_LIBS)
++libaribb25_la_LIBADD = $(AM_LIBS) $(PC_LIBS)

  libaribb25_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -fvisibility=hidden $(pcsclite_CFLAGS)
  
  pkginclude_HEADERS = src/arib_std_b25_error_code.h src/b_cas_card_error_code.h \
  libaribb25_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -fvisibility=hidden $(pcsclite_CFLAGS)
  
  pkginclude_HEADERS = src/arib_std_b25_error_code.h src/b_cas_card_error_code.h \

+--- aribb25-0.2.7/configure.ac.orig    2016-02-18 17:58:55.000000000 +0100
++++ aribb25-0.2.7/configure.ac 2016-10-08 08:44:14.628707093 +0200
+@@ -73,7 +73,7 @@
+   AC_MSG_RESULT([no]))
+   LIBS="$gt_save_LIBS"
+   AC_SUBST(pcsclite_CFLAGS, ["-I$SDKROOT/System/Library/Frameworks/PCSC.framework/Headers"])
+-  AC_SUBST(PCSC_LIBS, ["-Wl,-framework -Wl,PCSC"])
++  AC_SUBST(PC_LIBS, ["-Wl,-framework -Wl,PCSC"])
+ ],[
+   PKG_CHECK_MODULES(pcsclite, "libpcsclite", [
+     AC_DEFINE(HAVE_PCSC, 1, "have libpcsclite")

diff --git a/aribb25.spec b/aribb25.spec
index 126378285ef2bd0db76eef99101c76e61868c2c8..37b6ecb50b70503e3dd1cf2e37bce1e01ff16cce 100644 (file)
--- a/aribb25.spec
+++ b/aribb25.spec
@@ -5,12 +5,12 @@
 Summary:       ARIB B25 library
 Summary(pl.UTF-8):     Biblioteka ARIB B25
 Name:          aribb25
 Summary:       ARIB B25 library
 Summary(pl.UTF-8):     Biblioteka ARIB B25
 Name:          aribb25

-Version:       0.2.6
+Version:       0.2.7

 Release:       1
 Release:       1

-License:       unknown
+License:       ISC

 Group:         Libraries
 Source0:       http://download.videolan.org/pub/videolan/aribb25/%{version}/%{name}-%{version}.tar.gz
 Group:         Libraries
 Source0:       http://download.videolan.org/pub/videolan/aribb25/%{version}/%{name}-%{version}.tar.gz

-# Source0-md5: f797a8f8a1bab4361d2111046aca58b6
+# Source0-md5: a63e6c81210903c3d202082ddcf10176

 Patch0:                %{name}-link.patch
 URL:           http://www.marumo.ne.jp/
 BuildRequires: autoconf >= 2.69
 Patch0:                %{name}-link.patch
 URL:           http://www.marumo.ne.jp/
 BuildRequires: autoconf >= 2.69


@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libaribb25.la
 # packaged as %doc
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libaribb25.la
 # packaged as %doc

-%{__rm} $RPM_BUILD_ROOT%{_docdir}/aribb25/README.txt
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/aribb25/{LICENCE,README.md,README.jp.txt}

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -83,7 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc README.txt
+%doc LICENCE README.md
+%lang(ja) %doc README.jp.txt

 %attr(755,root,root) %{_libdir}/libaribb25.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libaribb25.so.0
 
 %attr(755,root,root) %{_libdir}/libaribb25.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libaribb25.so.0