rpms/isomaster/FC-5 isomaster-0.8.1-optflags.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 isomaster.spec, 1.2, 1.3 sources, 1.2, 1.3

[Marcin Zajaczkowski (szpak)]

Author: szpak

Update of /cvs/extras/rpms/isomaster/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13704

Modified Files:
	.cvsignore isomaster.spec sources 
Added Files:
	isomaster-0.8.1-optflags.diff 
Log Message:
Updated to 0.8.1

isomaster-0.8.1-optflags.diff:

--- NEW FILE isomaster-0.8.1-optflags.diff ---
--- Makefile	2007-03-18 18:41:13.000000000 +0100
+++ Makefile.opt	2007-03-19 19:32:32.239138794 +0100
@@ -33,7 +33,7 @@
 export ECHO    = echo
 
 # -DDEBUG and -g only used during development
-CFLAGS += -Wall -pedantic -std=gnu99 `pkg-config --cflags gtk+-2.0` -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+CFLAGS += ${OPTFLAGS} -pedantic -std=gnu99 `pkg-config --cflags gtk+-2.0` -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
 ifndef WITHOUT_NLS
 	CFLAGS += -DENABLE_NLS
 endif
--- bk/Makefile	2007-03-18 18:41:13.000000000 +0100
+++ bk/Makefile.opt	2007-03-19 19:33:13.822255394 +0100
@@ -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
 
 # -DDEBUG and -g only used during development
-CFLAGS  += -Wall -pedantic -std=gnu99
+CFLAGS  += ${OPTFLAGS} -pedantic -std=gnu99
 
 # the _FILE_OFFSET_BITS=64 is to enable stat() for large files
 CPPFLAGS = -D_FILE_OFFSET_BITS=64
--- iniparser-2.15/Makefile	2006-12-15 07:03:08.000000000 +0100
+++ iniparser-2.15/Makefile.opt	2007-03-19 19:34:13.022018597 +0100
@@ -4,6 +4,7 @@
 
 # Compiler settings
 # CFLAGS  = -O3 -pedantic -std=c99
+CFLAGS = ${OPTFLAGS} -pedantic -std=c99
 
 # Ar settings to build the library
 ARFLAGS = rcv


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jan 2007 19:16:00 -0000	1.2
+++ .cvsignore	22 Mar 2007 18:41:27 -0000	1.3
@@ -1 +1 @@
-isomaster-0.7.tar.bz2
+isomaster-0.8.1.tar.bz2


Index: isomaster.spec
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-5/isomaster.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isomaster.spec	26 Jan 2007 19:59:22 -0000	1.2
+++ isomaster.spec	22 Mar 2007 18:41:27 -0000	1.3
@@ -1,20 +1,16 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	0.7
-Release:	3%{?dist}
+Version:	0.8.1
+Release:	1%{?dist}
 License:	GPL
 Group: 		Applications/File
 URL:		http://littlesvr.ca/isomaster/
 #moved to .rpmmacros
 #Packager:	Marcin Zajaczkowski <mszpak ATT wp DOTT pl>
 Source0:	http://littlesvr.ca/isomaster/releases/isomaster-%{version}.tar.bz2
-Source1:	isomaster.desktop
+#Source1:	isomaster.desktop
 #using %%{optflags}
-Patch0:		isomaster-0.7-optflags.diff
-#using proper path for man
-Patch1:		isomaster-0.7-manpath.diff
-#correcting wrong dependencies which broke parallel build
-Patch2:		isomaster-0.7-dep.diff
+Patch0:		isomaster-0.8.1-optflags.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #author is not sure about version, but 2.8 should be enough
 #removed because libgdk-x11-2.0.so.0 already forces gtk+ 
@@ -30,9 +26,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
@@ -46,7 +40,11 @@
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
-	%{SOURCE1}
+	isomaster.desktop
+#	%{SOURCE1}
+
+#is already installed by desktop-file-install
+rm %{buildroot}%{_datadir}/applications/isomaster.desktop
 
 %clean
 rm -fr %{buildroot}
@@ -56,10 +54,16 @@
 %attr(0755,root,root) %{_bindir}/isomaster
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT
-%{_datadir}/applications/*.desktop
+#think about merge with upstream .desktop file
+%{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Mon Mar 19 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.8.1-1
+ - updated to 0.8.1
+ - removed unused patches (merged with upstream)
+ - using desktop file from upstream
+
 * Fri Jan 26 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.7-3
  - bumped to next release to workaround problem with FC-5 tag in CVS
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jan 2007 19:16:00 -0000	1.2
+++ sources	22 Mar 2007 18:41:27 -0000	1.3
@@ -1 +1 @@
-ecc0a033211bb61c18a0bdde5612f2c9  isomaster-0.7.tar.bz2
+32066d9358f7f2601c3dc5344687f572  isomaster-0.8.1.tar.bz2