[packages/Heimdall] - updated to 1.4.2

bszx bszx at pld-linux.org
Sun May 12 08:59:19 CEST 2019


commit 3df803bb3e38d6b63a811bb1a0cbb5aa0550cd19
Author: Bartek Szady <bszx at bszx.eu>
Date:   Sun May 12 08:56:24 2019 +0200

    - updated to 1.4.2

 Heimdall-udev-rules.patch | 11 ----------
 Heimdall.spec             | 56 ++++++++++++-----------------------------------
 2 files changed, 14 insertions(+), 53 deletions(-)
---
diff --git a/Heimdall.spec b/Heimdall.spec
index e875ba6..da2ffa4 100644
--- a/Heimdall.spec
+++ b/Heimdall.spec
@@ -1,22 +1,19 @@
 Summary:	Flash firmware on to Samsung Galaxy S devices
 Name:		Heimdall
-Version:	1.4.1
+Version:	1.4.2
 Release:	1
 License:	MIT
 Group:		Development/Tools
-Source0:	https://github.com/Benjamin-Dobell/Heimdall/archive/v1.4.1/%{name}-%{version}.tar.gz
-# Source0-md5:	22c911e9042f5ed8fd90cbeeb9589015
+Source0:	https://github.com/Benjamin-Dobell/Heimdall/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	49a6537f647b50057a3096180c4f0ac3
 Source1:	%{name}.desktop
-Patch0:		%{name}-udev-rules.patch
 URL:		http://glassechidna.com.au/heimdall/
-BuildRequires:	QtGui-devel
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.10
+BuildRequires:	Qt5Widgets-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libusb-devel >= 1.0.8
 BuildRequires:	pkgconfig
-BuildRequires:	qt4-build
-BuildRequires:	qt4-qmake
+BuildRequires:	qt5-build
+BuildRequires:	cmake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,50 +33,24 @@ This package provides Qt4 based frontend for Heimdall.
 
 %prep
 %setup -q
-%patch0 -p1
-
-sed -i -e 's|/usr/local/bin|%{_bindir}|g' heimdall-frontend/heimdall-frontend.pro
 
 # remove unneeded files
-rm -rf libusbx-1.0
 rm -rf Win32
-rm -rf heimdall-frontend/lib/win32
-rm -rf heimdall-frontend/include
-rm -rf heimdall/autom4te.cache
-rm -rf libpit/autom4te.cache
 rm -rf OSX
-rm -f heimdall/postremove-pak
-rm -f heimdall/postinstall-pak
 
 %build
-cd libpit
-%configure
-%{__make}
-cd ..
-
-cd heimdall
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
+install -d build
+cd build
+%cmake \
+        ../
 %{__make}
-cd ..
-
-cd heimdall-frontend
-qmake-qt4
-%{__make}
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-
-%{__make} -C heimdall install \
-	DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},/lib/udev/rules.d}
 
-%{__make} -C heimdall-frontend install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
+install build/bin/heimdall{,-frontend} $RPM_BUILD_ROOT%{_bindir}/
+install heimdall/60-heimdall.rules $RPM_BUILD_ROOT/lib/udev/rules.d/
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/heimdall.desktop
 
@@ -88,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc Linux/README
 %attr(755,root,root) %{_bindir}/heimdall
 /lib/udev/rules.d/60-heimdall.rules
 
diff --git a/Heimdall-udev-rules.patch b/Heimdall-udev-rules.patch
deleted file mode 100644
index 4823549..0000000
--- a/Heimdall-udev-rules.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Heimdall-1.4.1/heimdall/Makefile.am.udevrules	2015-11-25 23:13:37.900138854 +0100
-+++ Heimdall-1.4.1/heimdall/Makefile.am	2015-11-25 23:13:47.357000186 +0100
-@@ -21,7 +21,7 @@ heimdall_LDADD = $(DEPS_LIBS) $(STATIC_L
- 
- if LINUXTARGET
- 
--udevrulesdir = @libdir@/udev/rules.d
-+udevrulesdir = /lib/udev/rules.d
- udevrules_DATA = 60-heimdall.rules
- 
- install-data-hook:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Heimdall.git/commitdiff/3df803bb3e38d6b63a811bb1a0cbb5aa0550cd19



More information about the pld-cvs-commit mailing list