commit 104b168c1daac5c3c4d4ece110134c99d17491f3
Author: Tomasz Pala <[email protected]>
Date: Sun Aug 9 15:48:18 2015 +0200
get rid of patching things that could and should be done inline
qiv-misc.patch | 56 --------------------------------------------------------
qiv.spec | 14 +++++---------
2 files changed, 5 insertions(+), 65 deletions(-)
---
diff --git a/qiv.spec b/qiv.spec
index 3b3e7bd..664d3df 100644
--- a/qiv.spec
+++ b/qiv.spec
@@ -9,7 +9,6 @@ Source0:
http://spiegl.de/qiv/download/%{name}-%{version}.tgz
# Source0-md5: 93aea7469be64ebd35277a6dac079fc8
Source1: %{name}.desktop
Source2: %{name}.png
-Patch0: %{name}-misc.patch
URL: http://spiegl.de/qiv/
BuildRequires: gtk+2-devel
BuildRequires: imlib2-devel
@@ -35,21 +34,18 @@ GDK/Imlib.
%prep
%setup -q
-%patch0 -p1
%build
%{__make} \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags}"
+ CFLAGS="%{rpmcflags} -Wall -fcaller-saves -ffast-math
-fno-strength-reduce -fthread-jumps"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d
$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir},%{_pixmapsdir}}
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- BINDIR=%{_bindir} \
- MANDIR=%{_mandir}
+install %{name} $RPM_BUILD_ROOT%{_bindir}
+install %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -61,6 +57,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc Changelog README README.TODO
%attr(755,root,root) %{_bindir}/%{name}
-%{_mandir}/man1/*
+%{_mandir}/man1/%{name}.1*
%{_desktopdir}/%{name}.desktop
%{_pixmapsdir}/%{name}.png
diff --git a/qiv-misc.patch b/qiv-misc.patch
deleted file mode 100644
index b2ad6ed..0000000
--- a/qiv-misc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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.
- PREFIX = /usr/local
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/man
-
- # Font to use for statusbar in fullscreen mode
- STATUSBAR_FONT = "fixed"
-@@ -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 \
-@@ -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 ; \
-- then echo "-- Test Passed --" ; \
-- else echo "-- Test Failed --" ; \
-- fi
-+ install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-+ install -s -m 0755 $(PROGRAM) $(DESTDIR)$(BINDIR)
-+ install -m 0644 $(PROGRAM).1 $(DESTDIR)$(MANDIR)/man1
- @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"
-
- # the end... ;-)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qiv.git/commitdiff/104b168c1daac5c3c4d4ece110134c99d17491f3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
