[packages/i7z] - updated to 0.27.2 - removed obsolete link patch

qboosh qboosh at pld-linux.org
Sat Sep 15 09:20:06 CEST 2012


commit f01b01532f4c56c987a4079e258fef160e8aac43
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 15 09:20:50 2012 +0200

    - updated to 0.27.2
    - removed obsolete link patch

 i7z-link.patch | 21 ---------------------
 i7z.spec       | 11 ++++-------
 2 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/i7z.spec b/i7z.spec
index 8c89c35..6fd11b9 100644
--- a/i7z.spec
+++ b/i7z.spec
@@ -1,14 +1,13 @@
 Summary:	i3, i5 and i7 reporting tool for Linux
 Summary(pl.UTF-8):	Narzędzie informacyjne dla procesorów i3, i5 i i7 pod Linuksem
 Name:		i7z
-Version:	0.27.1
+Version:	0.27.2
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 #Source0Download: http://code.google.com/p/i7z/downloads/list
 Source0:	http://i7z.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	4408e0e39b195b8fe6383cadc971a862
-Patch0:		%{name}-link.patch
+# Source0-md5:	7f2c4928146b722d67ecdd0d905a4353
 URL:		http://code.google.com/p/i7z/
 BuildRequires:	ncurses-devel
 BuildRequires:	qt4-build
@@ -40,16 +39,14 @@ Oparte na Qt graficzne narzędzie informacyjne dla procesorów i3/i5/i7.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__make} clean
+CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/ncurses" \
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGSANY="%{rpmcflags} %{rpmcppflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall" \
-	INCLUDEFLAGS=-I/usr/include/ncurses \
 	LDFLAGS="%{rpmldflags}" \
-	LIBS="-lncurses -ltinfo -lpthread -lrt"
+	LIBS="-lncurses -ltinfo -lpthread -lrt -lm"
 
 cd GUI
 qmake-qt4 \
diff --git a/i7z-link.patch b/i7z-link.patch
deleted file mode 100644
index f0cbba4..0000000
--- a/i7z-link.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- i7z-0.27.1/Makefile.orig	2011-12-28 03:39:11.000000000 +0100
-+++ i7z-0.27.1/Makefile	2012-01-04 21:25:53.052486462 +0100
-@@ -28,7 +28,8 @@
- 
- CC       = gcc 
- 
--LDFLAGS  = -lncurses -lpthread -lrt
-+LDFLAGS  =
-+LIBS	 =-lncurses -lpthread -lrt
- INCLUDEFLAGS = 
- 
- OBJS = helper_functions
-@@ -44,7 +45,7 @@
- 	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
- 
- bin: 
--	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN)
-+	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) $(LIBS) -o $(BIN)
- 
- test_exist:
- 	@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/i7z.git/commitdiff/f01b01532f4c56c987a4079e258fef160e8aac43



More information about the pld-cvs-commit mailing list