rpms/isomaster/FC-6 isomaster-1.1-optflags.diff, NONE, 1.1 isomaster-1.1-viewer-variable.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 isomaster.spec, 1.5, 1.6 sources, 1.4, 1.5

Mon Sep 24 20:23:58 UTC 2007

Author: szpak

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

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



isomaster-1.1-optflags.diff:

--- NEW FILE isomaster-1.1-optflags.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.opt	2007-08-29 19:57:24.671354495 +0200
@@ -46,7 +46,7 @@
 export ECHO    = echo
 
 # -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	2007-08-27 12:43:22.000000000 +0200
+++ bk/Makefile.opt	2007-08-29 19:58:00.627517349 +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
 
 # -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	2007-07-27 07:27:35.000000000 +0200
+++ iniparser-2.17/Makefile.opt	2007-08-29 20:01:37.364315099 +0200
@@ -4,7 +4,7 @@
 
 # Compiler settings
 CC      = gcc
-CFLAGS  = -O3 -fPIC
+CFLAGS  = ${OPTFLAGS} -fPIC
 
 # Ar settings to build the library
 AR	    = ar

isomaster-1.1-viewer-variable.diff:

--- NEW FILE isomaster-1.1-viewer-variable.diff ---
--- Makefile	2007-08-27 12:43:22.000000000 +0200
+++ Makefile.fed	2007-08-30 20:18:21.150894332 +0200
@@ -22,11 +22,11 @@
 # The default editor for files from the image. Users can change this. I
 # recommend you set it to a graphical text editor that is likely to be 
 # installed by default on your distribution.
-DEFAULT_EDITOR = mousepad
+DEFAULT_EDITOR ?= mousepad
 
 # The default viewer for files from the image. I recommend you make it 
 # a web browser because it can display the widest range of files.
-DEFAULT_VIEWER = firefox
+DEFAULT_VIEWER ?= firefox
 
 # To disable i18n completely, uncomment the following line 
 # or define WITHOUT_NLS somewhere else.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Jun 2007 20:32:14 -0000	1.4
+++ .cvsignore	24 Sep 2007 20:23:25 -0000	1.5
@@ -1 +1,2 @@
-isomaster-1.0.tar.bz2
+isomaster-1.1.tar.bz2
+text-editor-0.1.tar.gz


Index: isomaster.spec
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/isomaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- isomaster.spec	25 Aug 2007 17:37:30 -0000	1.5
+++ isomaster.spec	24 Sep 2007 20:23:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		isomaster
 Summary:	An easy to use GUI CD image editor
-Version:	1.0
+Version:	1.1
 Release:	2%{?dist}
 License:	GPLv2
 Group: 		Applications/File
@@ -8,40 +8,44 @@
 #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:	http://timeoff.wsisiz.edu.pl/rpms/isomaster/text-editor-0.1.tar.gz
 #using %%{optflags}
-Patch0:		isomaster-0.8.1-optflags.diff
+Patch0:		isomaster-1.1-optflags.diff
+Patch1:		isomaster-1.1-viewer-variable.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+ 
-#Requires:	gtk2
+#to call viewers for the files
+Requires:	xdg-utils
+#author is not sure about gtk2 version, but 2.8 should be enough
 BuildRequires: 	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
 %description
-ISO Master: an easy to use GUI CD image editor. 
+ISO Master: an easy to use graphical CD image editor. 
 It allows to extract files from an ISO, add files to an ISO, 
 and create bootable ISOs - all in a graphical user interface.
+It can open ISO, NRG, and some MDF files but can only save as ISO.
 
 %prep
 %setup -q
+%setup -q -T -D -a 1
 %patch0 -p0
+%patch1 -p0
 
 %build
 #PREFIX is required to specify a correct dir for icons
-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
 
 %install
 rm -fr %{buildroot}
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
 
 %find_lang %{name}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	isomaster.desktop
-#	%{SOURCE1}
 
 #is already installed by desktop-file-install
 rm %{buildroot}%{_datadir}/applications/isomaster.desktop
@@ -52,12 +56,20 @@
 %files -f %{name}.lang
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/isomaster
+%attr(0755,root,root) %{_bindir}/text-editor.sh
 %{_datadir}/%{name}
 %doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
 %{_datadir}/applications/fedora-isomaster.desktop
 %{_mandir}/man1/isomaster.1*
 
 %changelog
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-2
+- added text-editor.sh to find existing GUI text editor
+
+* Wed Aug 29 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.1-1
+- updated to 1.1
+- a default viewer is called by xdg-open (from xdg-utils)
+
 * Sat Aug 25 2007 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.0-2
 - specified licence type (due to a new Licensing Guidelines)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isomaster/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jun 2007 20:32:14 -0000	1.4
+++ sources	24 Sep 2007 20:23:25 -0000	1.5
@@ -1 +1,2 @@
-6bbb781a1b73499d3c0c6d961521cd9d  isomaster-1.0.tar.bz2
+f1c54cf16ffbce30b2f97cdc21ed0f99  isomaster-1.1.tar.bz2
+55cd78e0d34134821694bac20e77b2a1  text-editor-0.1.tar.gz


