This commit is contained in:
Xavier Bachelot 2013-12-22 09:59:20 +01:00
parent b00ee0835b
commit 0f5a7026ff
3 changed files with 15 additions and 11 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/libbluray-0.2.2.tar.bz2 /libbluray-0.2.2.tar.bz2
/libbluray-0.2.3.tar.bz2 /libbluray-0.2.3.tar.bz2
/libbluray-0.4.0.tar.bz2 /libbluray-0.4.0.tar.bz2
/libbluray-0.5.0.tar.bz2

View File

@ -5,11 +5,11 @@
%global build_pdf_doc 0 %global build_pdf_doc 0
Name: libbluray Name: libbluray
Version: 0.4.0 Version: 0.5.0
%if %{snapshot} %if %{snapshot}
Release: 0.1.%{tarball_date}git%{git_short}%{?dist} Release: 0.1.%{tarball_date}git%{git_short}%{?dist}
%else %else
Release: 2%{?dist} Release: 1%{?dist}
%endif %endif
Summary: Library to access Blu-Ray disks for video playback Summary: Library to access Blu-Ray disks for video playback
Group: System Environment/Libraries Group: System Environment/Libraries
@ -33,7 +33,7 @@ BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
%endif %endif
%ifnarch ppc ppc64 %ifnarch ppc ppc64
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
BuildRequires: ant BuildRequires: ant
%endif %endif
@ -57,14 +57,15 @@ such as mplayer and vlc.
Summary: BDJ support for %{name} Summary: BDJ support for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: java >= 1:1.6.0 Requires: java >= 1:1.7.0
Requires: jpackage-utils Requires: jpackage-utils
Obsoletes: libbluray-java < 0.4.0-2 Obsoletes: libbluray-java < 0.4.0-2
Provides: libbluray-java = %{version}-%{release} Provides: libbluray-java = %{version}-%{release}
%description bdj %description bdj
The %{name}-bdj package contains the jar file needed to add BDJ support to The %{name}-bdj package contains the jar file needed to add BD-J support to
%{name}. %{name}.
BD-J support is still considered alpha.
%endif %endif
%package utils %package utils
@ -128,13 +129,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# Install test utilities # Install test utilities
for i in clpi_dump index_dump mobj_dump mpls_dump sound_dump; for i in bdsplice clpi_dump hdmv_test index_dump libbluray_test \
do install -Dp -m 0755 src/examples/$i $RPM_BUILD_ROOT%{_bindir}/$i; done; list_titles mobj_dump mpls_dump sound_dump
for i in bd_info bdsplice hdmv_test libbluray_test list_titles; do install -Dp -m 0755 src/$i $RPM_BUILD_ROOT%{_bindir}/$i; done;
do install -Dp -m 0755 src/examples/.libs/$i %{buildroot}%{_bindir}/$i; done;
%ifnarch ppc ppc64 %ifnarch ppc ppc64
install -Dp -m755 src/examples/.libs/bdj_test %{buildroot}%{_bindir}/bdj_test; install -Dp -m755 src/bdj_test %{buildroot}%{_bindir}/bdj_test;
%endif %endif
@ -174,6 +174,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Dec 21 2013 Xavier Bachelot <xavier@bachelot.org> 0.5.0-1
- Update to 0.5.0.
* Tue Nov 26 2013 Xavier Bachelot <xavier@bachelot.org> 0.4.0-2 * Tue Nov 26 2013 Xavier Bachelot <xavier@bachelot.org> 0.4.0-2
- Move test utilities to their own subpackage to avoid multilib conflict. - Move test utilities to their own subpackage to avoid multilib conflict.
Fix RHBZ#1034307. Fix RHBZ#1034307.

View File

@ -1 +1 @@
c7a1cc71cb9747f93122ec650d4ae933 libbluray-0.4.0.tar.bz2 04cf15d0f3581a955d3a2ccb9dc06e9e libbluray-0.5.0.tar.bz2