Skip to content

Commit

Permalink
Fix a typo in armv7tnhl compatibility detection spotted by Carsten
Browse files Browse the repository at this point in the history
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
  • Loading branch information
Islam Amer committed Jul 2, 2013
1 parent 6d3a331 commit 1e3a4de
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
12 changes: 12 additions & 0 deletions fix-armv7tnhl-typo.patch
@@ -0,0 +1,12 @@
diff -Naur libsolv-0.1.0-orig/src/poolarch.c libsolv-0.1.0/src/poolarch.c
--- libsolv-0.1.0-orig/src/poolarch.c 2012-06-25 15:17:22.000000000 +0300
+++ libsolv-0.1.0/src/poolarch.c 2013-07-02 21:21:34.493402720 +0300
@@ -31,7 +31,7 @@
"ia64", "ia64:i686:i586:i486:i386",
"ppc64", "ppc64:ppc",
"ppc", "ppc",
- "armv7tnhl", "arvm7tnhl:armv7thl:armv7nhl:armv7hl",
+ "armv7tnhl", "armv7tnhl:armv7thl:armv7nhl:armv7hl",
"armv7thl", "armv7thl:armv7hl",
"armv7nhl", "armv7nhl:armv7hl",
"armv7hl", "armv7hl",
3 changes: 3 additions & 0 deletions libsolv.changes
@@ -1,3 +1,6 @@
* Tue Jul 02 2013 Islam Amer <islam.amer@jollamobille.com> - 0.1.0
- fix typo in armv7tnhl compatibility resolving spotted by Carsten

* Tue Dec 18 2012 David Greaves <david@dgreaves.com> - 0.1.0
- Ensure the current libsolv0 version is installed
Fixes MER#654
Expand Down
10 changes: 6 additions & 4 deletions libsolv.spec
@@ -1,6 +1,6 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.25
# Generated by: spectacle version 0.26
#

Name: libsolv
Expand All @@ -17,6 +17,7 @@ License: BSD 3-Clause
URL: git://gitorious.org/opensuse/libsolv.git
Source0: libsolv-%{version}.tar.bz2
Source100: libsolv.yaml
Patch0: fix-armv7tnhl-typo.patch
BuildRequires: pkgconfig(rpm)
BuildRequires: pkgconfig(zlib)
BuildRequires: db4-devel
Expand Down Expand Up @@ -85,15 +86,16 @@ Requires: bzip2
Requires: coreutils
Requires: libsolv0 = %version
Provides: satsolver-tools = 0.18
Obsoletes: satsolver-tools < 0.18
Obsoletes: satsolver-tools < 0.18

%description tools
A new approach to package dependency solving.


%prep
%setup -q -n %{name}-%{version}

# fix-armv7tnhl-typo.patch
%patch0 -p1
# >> setup
# << setup

Expand Down Expand Up @@ -129,11 +131,11 @@ rm -rf %{buildroot}
export NO_BRP_STRIP_DEBUG=true
# << install post


%post -n libsolv0 -p /sbin/ldconfig

%postun -n libsolv0 -p /sbin/ldconfig


%files demo
%defattr(-,root,root,-)
# >> files demo
Expand Down
2 changes: 2 additions & 0 deletions libsolv.yaml
Expand Up @@ -7,6 +7,8 @@ License: BSD 3-Clause
URL: git://gitorious.org/opensuse/libsolv.git
Sources:
- libsolv-%{version}.tar.bz2
Patches:
- fix-armv7tnhl-typo.patch
Description: A new approach to package dependency solving.

PkgConfigBR:
Expand Down

0 comments on commit 1e3a4de

Please sign in to comment.