Author: qboosh Date: Mon Jun 6 08:02:33 2011 GMT Module: packages Tag: HEAD ---- Log message: - added link patch to fix linking using ld.bfd - use optflags when building GUI - moved i7z_GUI to -gui subpackage
---- Files affected: packages/i7z: i7z.spec (1.3 -> 1.4) , i7z-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/i7z/i7z.spec diff -u packages/i7z/i7z.spec:1.3 packages/i7z/i7z.spec:1.4 --- packages/i7z/i7z.spec:1.3 Tue May 31 21:54:37 2011 +++ packages/i7z/i7z.spec Mon Jun 6 10:02:24 2011 @@ -1,5 +1,4 @@ # $Revision$, $Date$ -# TODO: optflags in GUI 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 @@ -11,6 +10,7 @@ Source0: http://i7z.googlecode.com/files/%{name}-%{version}.tar.gz # Source0-md5: 4f16f8ba2096e6156caab300e9e034e3 Patch0: %{name}-c++.patch +Patch1: %{name}-link.patch URL: http://code.google.com/p/i7z/ BuildRequires: ncurses-devel BuildRequires: qt4-build @@ -26,20 +26,39 @@ %description -l pl.UTF-8 Lepsze narzędzie informacyjne dla procesorów i7 (teraz także i3, i5) -działajace pod Linuksem. +działające pod Linuksem. + +%package gui +Summary: Qt-based graphical i3/i5/i7 CPU reporting tool +Summary(pl.UTF-8): Oparte na Qt graficzne narzędzie informacyjne dla procesorów i3/i5/i7 +Group: X11/Applications +Requires: %{name} = %{version}-%{release} + +%description gui +Qt-based graphical i3/i5/i7 CPU reporting tool. + +%description gui -l pl.UTF-8 +Oparte na Qt graficzne narzędzie informacyjne dla procesorów i3/i5/i7. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__make} \ CC="%{__cc}" \ CFLAGSANY="%{rpmcflags} %{rpmcppflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall" \ INCLUDEFLAGS=-I/usr/include/ncurses \ - LDFLAGS="%{rpmldflags} -lncurses -ltinfo -lpthread" -%{__make} -C GUI \ -# CXXFLAGS="%{rpmcflags}" + LDFLAGS="%{rpmldflags}" \ + LIBS="-lncurses -ltinfo -lpthread" + +cd GUI +qmake-qt4 \ + QMAKE_CXX="%{__cxx}" \ + QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \ + QMAKE_LFLAGS_RELEASE="%{rpmldflags}" +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -54,7 +73,11 @@ %files %defattr(644,root,root,755) %doc README.txt -%attr(755,root,root) %{_sbindir}/%{name}* +%attr(755,root,root) %{_sbindir}/i7z + +%files gui +%defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/i7z_GUI %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -62,6 +85,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2011/06/06 08:02:24 qboosh +- added link patch to fix linking using ld.bfd +- use optflags when building GUI +- moved i7z_GUI to -gui subpackage + Revision 1.3 2011/05/31 19:54:37 qboosh - updated to 0.26 - pl ================================================================ Index: packages/i7z/i7z-link.patch diff -u /dev/null packages/i7z/i7z-link.patch:1.1 --- /dev/null Mon Jun 6 10:02:33 2011 +++ packages/i7z/i7z-link.patch Mon Jun 6 10:02:24 2011 @@ -0,0 +1,21 @@ +--- i7z-0.26/Makefile.orig 2010-10-04 07:34:19.000000000 +0200 ++++ i7z-0.26/Makefile 2011-06-06 09:52:46.750087015 +0200 +@@ -28,7 +28,8 @@ + + CC = gcc + +-LDFLAGS = -lncurses -lpthread ++LDFLAGS = ++LIBS =-lncurses -lpthread + 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) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) $(LIBS) -o $(BIN) + + clean: + rm -f *.o $(BIN) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/i7z/i7z.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
