[heimdall] Update to version 1.4.0
Juan Orti
jorti at fedoraproject.org
Tue Jun 11 07:44:30 UTC 2013
commit e604d0e26378ebacf319cca7f86b91ad6aea69f1
Author: Juan Orti Alcaine <jorti at fedoraproject.org>
Date: Tue Jun 11 09:44:01 2013 +0200
Update to version 1.4.0
heimdall-usr_udev_rules.patch | 16 ++++++++--------
heimdall.spec | 19 +++++++++++--------
2 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/heimdall-usr_udev_rules.patch b/heimdall-usr_udev_rules.patch
index a96cfee..80c7fbd 100644
--- a/heimdall-usr_udev_rules.patch
+++ b/heimdall-usr_udev_rules.patch
@@ -1,26 +1,26 @@
diff --git a/heimdall/Makefile.am b/heimdall/Makefile.am
-index dcebb73..8a98a19 100644
+index 6ed343c..3e5c3b9 100644
--- a/heimdall/Makefile.am
+++ b/heimdall/Makefile.am
-@@ -23,7 +23,7 @@ heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
+@@ -22,7 +22,7 @@ heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
if LINUXTARGET
--udevrulesdir = /lib/udev/rules.d
+-udevrulesdir = ${libdir}/udev/rules.d
+udevrulesdir = /usr/lib/udev/rules.d
- udevrules_DATA = 60-heimdall-galaxy-s.rules
+ udevrules_DATA = 60-heimdall.rules
install-data-hook:
diff --git a/heimdall/Makefile.in b/heimdall/Makefile.in
-index 991cdd6..c536f1b 100644
+index 99ffe9f..521bd44 100644
--- a/heimdall/Makefile.in
+++ b/heimdall/Makefile.in
-@@ -263,7 +263,7 @@ heimdall_SOURCES = source/Arguments.cpp \
+@@ -377,7 +377,7 @@ heimdall_SOURCES = source/Arguments.cpp \
source/VersionAction.cpp
heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
-- at LINUXTARGET_TRUE@udevrulesdir = /lib/udev/rules.d
+- at LINUXTARGET_TRUE@udevrulesdir = ${libdir}/udev/rules.d
+ at LINUXTARGET_TRUE@udevrulesdir = /usr/lib/udev/rules.d
- @LINUXTARGET_TRUE at udevrules_DATA = 60-heimdall-galaxy-s.rules
+ @LINUXTARGET_TRUE at udevrules_DATA = 60-heimdall.rules
dist_noinst_SCRIPTS = autogen.sh
all: config.h
diff --git a/heimdall.spec b/heimdall.spec
index d3c1651..058a622 100644
--- a/heimdall.spec
+++ b/heimdall.spec
@@ -2,12 +2,13 @@
%global _udevrulesdir /usr/lib/udev/rules.d
%endif
-%global commit 8c6b20a487b36a7fa9679d55a1375d20f72a0b92
+%global commit 910ae1d1fed7b608239b344b6d92c9165a0b8d52
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global tag v1.4.0
Name: heimdall
-Version: 1.4
-Release: 0.4.rc2%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: Flash firmware on to Samsung Galaxy S devices
Group: Development/Tools
License: MIT
@@ -71,7 +72,7 @@ pushd heimdall
make %{?_smp_mflags}
popd
pushd heimdall-frontend
- qmake-qt4 heimdall-frontend.pro
+ qmake-qt4
make %{?_smp_mflags}
popd
@@ -91,18 +92,20 @@ desktop-file-install \
%files
-%doc Linux/README heimdall/LICENSE
+%doc Linux/README LICENSE
%{_bindir}/%{name}
-%{_udevrulesdir}/60-heimdall-galaxy-s.rules
+%{_udevrulesdir}/60-heimdall.rules
%files frontend
-%doc Linux/README heimdall/LICENSE
+%doc Linux/README LICENSE
%{_bindir}/%{name}-frontend
%{_datadir}/applications/%{name}.desktop
%changelog
-* Tue Mar 12 2013 Juan Orti Alcaine <j.orti.alcaine at gmail.com> - 1.4-0.4.rc2
+* Tue Jun 11 2013 Juan Orti Alcaine <jorti at fedoraproject.org> - 1.4.0-1
+- Update to version 1.4.0
- Add zlib-devel BuildRequires and explicit version to qt-devel
+- Update udev rules dir patch
* Mon Feb 25 2013 Juan Orti Alcaine <j.orti.alcaine at gmail.com> - 1.4-0.3.rc2
- Add _udevrulesdir for f17
More information about the scm-commits
mailing list