rpms/jhead/devel jhead-makefile.patch,1.1,1.2 jhead.spec,1.20,1.21

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/jhead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17224

Modified Files:
	jhead-makefile.patch jhead.spec 
Log Message:
* Wed Sep 24 2008 Adrian Reber <adrian at lisas.de> - 2.82-2
- rebased makefile patch


jhead-makefile.patch:

Index: jhead-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jhead-makefile.patch	8 Nov 2004 04:37:02 -0000	1.1
+++ jhead-makefile.patch	24 Sep 2008 13:17:02 -0000	1.2
@@ -1,11 +1,20 @@
---- makefile.save	2004-10-13 20:39:03.744659640 +0200
-+++ makefile	2004-10-13 20:39:34.955914808 +0200
-@@ -9,7 +9,7 @@
- objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/makernote.o
+diff --git a/makefile b/makefile
+index 6549678..38d2371 100644
+--- a/makefile
++++ b/makefile
+@@ -3,13 +3,14 @@
+ #--------------------------------
+ OBJ=.
+ SRC=.
++CFLAGS?= -O3
+ 
+ all: jhead
+ 
+ objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o 
  
  $(OBJ)/%.o:$(SRC)/%.c
 -	${CC} -O3 -Wall -c $< -o $@
-+	${CC} ${CFLAGS} -Wall -c $< -o $@
++	${CC} $(CFLAGS) -Wall -c $< -o $@
  
  jhead: $(objs) jhead.h
  	${CC} -o jhead $(objs) -lm


Index: jhead.spec
===================================================================
RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jhead.spec	5 Apr 2008 11:47:58 -0000	1.20
+++ jhead.spec	24 Sep 2008 13:17:02 -0000	1.21
@@ -1,6 +1,6 @@
 Name: jhead
 Version: 2.82
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool for displaying EXIF data embedded in JPEG images
 Group: Applications/Multimedia
 License: Public Domain
@@ -15,7 +15,7 @@
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
@@ -37,6 +37,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep 24 2008 Adrian Reber <adrian at lisas.de> - 2.82-2
+- rebased makefile patch
+
 * Sat Apr 05 2008 Adrian Reber <adrian at lisas.de> - 2.82-1
 - updated to 2.82