rpms/isomaster/devel isomaster-1.3.3-optflags.diff, NONE, 1.1 isomaster.spec, 1.12, 1.13

Marcin Zajaczkowski szpak at fedoraproject.org
Sun Oct 5 22:04:28 UTC 2008


Author: szpak

Update of /cvs/pkgs/rpms/isomaster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10271

Modified Files:
	isomaster.spec 
Added Files:
	isomaster-1.3.3-optflags.diff 
Log Message:
Fixed problem with building package in Rawhide when used --fuzzy=0



isomaster-1.3.3-optflags.diff:

--- NEW FILE isomaster-1.3.3-optflags.diff ---
--- Makefile	2008-10-01 22:10:07.000000000 +0200
+++ Makefile.opt	2008-10-05 19:21:33.000000000 +0200
@@ -48,7 +48,7 @@
 VERSION = 1.3.3
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter `pkg-config --cflags gtk+-2.0`
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2008-10-01 22:10:07.000000000 +0200
+++ bk/Makefile.opt	2008-10-05 19:24:11.000000000 +0200
@@ -3,7 +3,7 @@
 OBJECTS = bkRead7x.o bkAdd.o bkDelete.o bkExtract.o bkRead.o bkPath.o bkMangle.o bkWrite.o bkWrite7x.o bkTime.o bkSort.o bkError.o bkGet.o bkSet.o bkCache.o bkLink.o bkMisc.o bkIoWrappers.o
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99 -Wundef -Wcast-align -W -Wpointer-arith -Wwrite-strings -Wno-unused-parameter
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.17/Makefile	2008-10-05 19:25:58.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2008-10-05 19:24:19.000000000 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar


Index: isomaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/devel/isomaster.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- isomaster.spec	5 Jul 2008 12:19:07 -0000	1.12
+++ isomaster.spec	5 Oct 2008 22:03:58 -0000	1.13
@@ -1,7 +1,7 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
 Version:	1.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
 URL:		http://littlesvr.ca/isomaster/
@@ -9,8 +9,8 @@
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
 Source1:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
-#using %%{optflags}
-Patch0:		isomaster-1.1-optflags.diff
+#using %%{optflags}, patch updated to work with --fuzzy=0 (has beeing used in Rawhide since October 2008)
+Patch0:		isomaster-1.3.3-optflags.diff
 Patch1:		isomaster-1.3-desktop.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #to call viewers for the files
@@ -67,6 +67,9 @@
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Sun Oct 5 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.3.3-2
+- fixed problem with building when --fuzzy=0 in patch command (#465088)
+
 * Sun Jul 1 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.3.3-1
 - updated to 1.3.3
 




More information about the scm-commits mailing list