Author: megabajt Date: Wed Feb 22 10:04:36 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.2.4
---- Files affected: packages/qiv: qiv.spec (1.43 -> 1.44) , qiv-misc.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: packages/qiv/qiv.spec diff -u packages/qiv/qiv.spec:1.43 packages/qiv/qiv.spec:1.44 --- packages/qiv/qiv.spec:1.43 Sat Jan 29 01:07:15 2011 +++ packages/qiv/qiv.spec Wed Feb 22 11:04:31 2012 @@ -2,18 +2,20 @@ Summary: Very fast image viewer for X Window Summary(pl.UTF-8): Bardzo szybka przeglądarka plików graficznych dla X Window Name: qiv -Version: 2.1 -Release: 0.pre12 +Version: 2.2.4 +Release: 1 License: GPL Group: X11/Applications/Graphics -Source0: http://www.klografx.net/qiv/download/%{name}-%{version}-pre12.tgz -# Source0-md5: 80ba1e2da5115a3cc3a6f7e19cb620d8 +Source0: http://spiegl.de/qiv/download/%{name}-%{version}.tgz +# Source0-md5: 1425f89c90f9c045858fccf24d894c97 Source1: %{name}.desktop Source2: %{name}.png Patch0: %{name}-misc.patch -URL: http://www.klografx.net/qiv/ -BuildRequires: gtk+-devel -BuildRequires: imlib-devel +URL: http://spiegl.de/qiv/ +BuildRequires: gtk+2-devel +BuildRequires: imlib2-devel +BuildRequires: libmagic-devel +BuildRequires: pkgconfig BuildRequires: xorg-lib-libXinerama-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,7 +33,7 @@ GDK/Imlib. %prep -%setup -q -n %{name}-%{version}-pre12 +%setup -q %patch0 -p1 %build @@ -68,6 +70,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.44 2012/02/22 10:04:31 megabajt +- updated to 2.2.4 + Revision 1.43 2011/01/29 00:07:15 sparky - dropped pre-cvs changelog ================================================================ Index: packages/qiv/qiv-misc.patch diff -u packages/qiv/qiv-misc.patch:1.7 packages/qiv/qiv-misc.patch:1.8 --- packages/qiv/qiv-misc.patch:1.7 Wed May 16 14:22:44 2007 +++ packages/qiv/qiv-misc.patch Wed Feb 22 11:04:31 2012 @@ -1,5 +1,5 @@ ---- qiv-2.0.orig/Makefile 2004-05-22 09:21:47.000000000 +0200 -+++ qiv-2.0/Makefile 2004-08-30 23:24:39.465273984 +0200 +--- qiv-2.2.4/Makefile.orig 2012-02-22 10:53:37.202184976 +0100 ++++ qiv-2.2.4/Makefile 2012-02-22 10:59:40.160218664 +0100 @@ -5,6 +5,8 @@ # Directory where qiv will be installed under. @@ -9,21 +9,39 @@ # Font to use for statusbar in fullscreen mode STATUSBAR_FONT = "fixed" -@@ -58,7 +60,8 @@ - ###################################################################### +@@ -47,7 +49,8 @@ MAGIC = -DHAVE_MAGIC CC = gcc + #CFLAGS = -O -g -Wall -CFLAGS = -O2 -Wall \ +OPTS = -O2 +CFLAGS = $(OPTS) -Wall \ -fcaller-saves -ffast-math -fno-strength-reduce \ -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN #CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ -@@ -124,13 +127,9 @@ +@@ -83,7 +86,8 @@ OBJS_G += lib/getopt.g lib/getopt1.g + endif + + ifdef GTD_XINERAMA +-LIBS += -L/usr/X11R6/lib -lXinerama ++INCLUDES += $(shell pkg-config --cflags xinerama) ++LIBS += $(shell pkg-config --libs xinerama) + endif + + ifdef MAGIC +@@ -127,21 +131,9 @@ distclean : clean install: $(PROGRAM) @echo "Installing QIV..." +- @if [ ! -e $(PREFIX)/bin ]; then \ +- install -d -m 0755 $(PREFIX)/bin; \ +- echo install -d -m 0755 $(PREFIX)/bin; \ +- fi - install -s -m 0755 $(PROGRAM) $(PREFIX)/bin +- @if [ ! -e $(PREFIX)/man/man1 ]; then \ +- echo install -d -m 0755 $(PREFIX)/man/man1; \ +- install -d -m 0755 $(PREFIX)/man/man1; \ +- fi - install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 - $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1 - @if ./qiv -f ./intro.jpg ; \ @@ -33,7 +51,6 @@ + install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 + install -s -m 0755 $(PROGRAM) $(DESTDIR)$(BINDIR) + install -m 0644 $(PROGRAM).1 $(DESTDIR)$(MANDIR)/man1 - @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" + @echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" - install-xscreensaver: install - + # the end... ;-) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qiv/qiv.spec?r1=1.43&r2=1.44&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qiv/qiv-misc.patch?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
