diff --git a/README.md b/README.md index 40d33a4..38ea329 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,17 @@ Check http://packages.ubuntu.com/trusty-updates/libssl1.0.0 wget http://example.com/somewhere +Alternatively, use spectool from Fedora's rpmdevtools package: +spectool -g -A opera-developer.spec + # build rpm package rpmbuild -bb opera-developer.spec # install rpm -rpm -ivh --nodeps opera-developer-*.x86_64.rpm +sudo yum localinstall opera-developer-*.x86_64.rpm # start to use opera developer -Just click icon or +Just click icon or run $ /usr/bin/opera-developer diff --git a/SPEC/opera-developer.spec b/SPEC/opera-developer.spec index 7c044a2..d08b023 100644 --- a/SPEC/opera-developer.spec +++ b/SPEC/opera-developer.spec @@ -1,9 +1,15 @@ %define deb_opera %{name}_%{version}_amd64.deb -%define deb_openssl libssl1.0.0_1.0.1f-1ubuntu2.4_amd64.deb +%define deb_openssl libssl1.0.0_1.0.1f-1ubuntu2.5_amd64.deb + +# these Requires are provided internally because of our bundling or symlinking +%global _excl lib(ssl|crypto|udev)\\.so +%global __requires_exclude %{_excl} +# they're provided internally, but not for other packages please +%global __provides_exclude_from ^.*/%{_excl}.*$ Summary: Opera Developer Name: opera-developer -Version: 24.0.1543.0 +Version: 25.0.1583.1 Release: 1%{dist} License: Proprietary Group: Applications/Internet @@ -12,11 +18,10 @@ Source0: http://get.geo.opera.com/pub/opera-developer/%{version}/linux/%{deb_ope # download ubuntu package from http://packages.ubuntu.com/trusty-updates/libssl1.0.0 Source1: http://mirrors.kernel.org/ubuntu/pool/main/o/openssl/%{deb_openssl} Vendor: Opera Software ASA -Packager: Nobuyuki Ito BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: x86_64 +Requires: %{_libdir}/libudev.so.1 Requires: systemd-libs -BuildRequires: binutils xz tar %description Opera Developer @@ -26,14 +31,17 @@ Opera Developer %setup -T -n %{name} -c %build -ar p $RPM_SOURCE_DIR/%{deb_openssl} data.tar.xz | xz -d -9 | tar x -C $RPM_BUILD_DIR +# nothing to do %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT +# provide openssl-1.0.0 +ar p %{SOURCE1} data.tar.xz | xz -d | tar x -C $RPM_BUILD_DIR + # extract data from the deb package -ar p $RPM_SOURCE_DIR/%{deb_opera} data.tar.xz | xz -d -9 | tar x -C $RPM_BUILD_ROOT +ar p %{SOURCE0} data.tar.xz | xz -d | tar x -C $RPM_BUILD_ROOT # rename libdir mv $RPM_BUILD_ROOT/usr/lib/x86_64-linux-gnu/%{name} $RPM_BUILD_ROOT/usr/lib/ @@ -42,7 +50,7 @@ mv $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT%{_libdir} # create new symlink rm -f $RPM_BUILD_ROOT%{_bindir}/%{name} -ln -sr $RPM_BUILD_ROOT%{_libdir}/%{name}/opera $RPM_BUILD_ROOT%{_bindir}/%{name} +ln -sr $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name} # delete some directories that is not needed on Fedora rm -rf $RPM_BUILD_ROOT%{_datadir}/{lintian,menu} @@ -61,8 +69,8 @@ done [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -# create symlink for libudev -[ -e %{_libdir}/libudev.so.1 ] && ln -fs %{_libdir}/libudev.so.1 %{_libdir}/%{name}/lib/libudev.so.0 +# create symlink for libudev.so.0 +ln -fs %{_libdir}/libudev.so.1 %{_libdir}/%{name}/lib/libudev.so.0 %postun [ -L %{_libdir}/%{name}/lib/libudev.so.0 ] && rm -f %{_libdir}/%{name}/lib/libudev.so.0 @@ -74,6 +82,18 @@ done %{_datadir} %changelog +* Mon Aug 11 2014 Moritz Barsnick 25.0.1583.1-1 +- update to 25.0.1583.1 +- fix symlink to binary +- use latest openssl package from Ubuntu +- use %%{SOURCE} macros +- unpack openssl in %%install phase +- drop xz compression flag for decompression +- drop Packager tag (should be provided by rpmbuild tool chain) and BRs + (they're all pre-provided on Fedora) +- fix Requires and Provides, in order to not require --no-deps and to not + provide bogus stuff + * Mon Jun 30 2014 Nobuyuki Ito - 24.0.1543.0 - version up - change libssl/libcrypto install dir