Requires: java-headless for Fedora 21+; Modernize specfile
This commit is contained in:
parent
8c9507f29a
commit
88a9cd481b
@ -9,10 +9,9 @@ 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: 3%{?dist}
|
Release: 4%{?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
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.videolan.org/developers/libbluray.html
|
URL: http://www.videolan.org/developers/libbluray.html
|
||||||
%if %{snapshot}
|
%if %{snapshot}
|
||||||
@ -25,7 +24,6 @@ Source0: %{name}-%{tarball_date}git%{git_short}.tar.bz2
|
|||||||
Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
Patch0: libbluray-0.2.2-no_doxygen_timestamp.patch
|
Patch0: libbluray-0.2.2-no_doxygen_timestamp.patch
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
|
||||||
|
|
||||||
%if %{snapshot}
|
%if %{snapshot}
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -61,7 +59,11 @@ 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.7.0
|
%if 0{?fedora} > 20
|
||||||
|
Requires: java-headless >= 1:1.7.0
|
||||||
|
%else
|
||||||
|
Requires: java >= 1:1.7.0
|
||||||
|
%endif
|
||||||
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}
|
||||||
@ -128,7 +130,6 @@ rm -f doc/doxygen/html/installdox
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||||
|
|
||||||
@ -142,32 +143,24 @@ install -Dp -m755 src/bdj_test %{buildroot}%{_bindir}/bdj_test;
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING README.txt
|
%doc COPYING README.txt
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
|
|
||||||
%ifnarch ppc ppc64 ppc64le
|
%ifnarch ppc ppc64 ppc64le
|
||||||
%files bdj
|
%files bdj
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/libbluray/libbluray.jar
|
%{_libdir}/libbluray/libbluray.jar
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files utils
|
%files utils
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc doc/doxygen/html
|
%doc doc/doxygen/html
|
||||||
%if %{build_pdf_doc}
|
%if %{build_pdf_doc}
|
||||||
%doc doc/doxygen/libbluray.pdf
|
%doc doc/doxygen/libbluray.pdf
|
||||||
@ -178,6 +171,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 21 2014 Xavier Bachelot <xavier@bachelot.org> 0.5.0-4
|
||||||
|
- Requires: java-headless for Fedora 21+ (RHBZ#1068351).
|
||||||
|
- Modernize specfile.
|
||||||
|
|
||||||
* Fri Jan 10 2014 Xavier Bachelot <xavier@bachelot.org> 0.5.0-3
|
* Fri Jan 10 2014 Xavier Bachelot <xavier@bachelot.org> 0.5.0-3
|
||||||
- Disable BD-J support for ppc64le arch (RHBZ#1051604).
|
- Disable BD-J support for ppc64le arch (RHBZ#1051604).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user