rpms/isomaster/devel isomaster-1.3.6-snprintf.patch, NONE, 1.1 isomaster-1.3.7-optflags.diff, NONE, 1.1 .cvsignore, 1.10, 1.11 isomaster.spec, 1.17, 1.18 sources, 1.10, 1.11
Marcin Zajaczkowski
szpak at fedoraproject.org
Thu Jan 14 20:10:19 UTC 2010
Author: szpak
Update of /cvs/pkgs/rpms/isomaster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14223
Modified Files:
.cvsignore isomaster.spec sources
Added Files:
isomaster-1.3.6-snprintf.patch isomaster-1.3.7-optflags.diff
Log Message:
Updated isomaster to 1.3.7 (devel)
isomaster-1.3.6-snprintf.patch:
settings.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE isomaster-1.3.6-snprintf.patch ---
Index: settings.c
===================================================================
--- settings.c (révision 610)
+++ settings.c (copie de travail)
@@ -608,7 +608,7 @@
if(GBLsettingsDictionary != NULL)
{
char configNameStr[20] = "ui:recentlyopen";
- snprintf(configNameStr + 15, 20, "%d", i);
+ snprintf(configNameStr + 15, 5, "%d", i);
tempStr = iniparser_getstring(GBLsettingsDictionary,
configNameStr, NULL);
@@ -893,7 +893,7 @@
for(int i = 0; i < 5; i++)
{
char configNameStr[20] = "ui:recentlyopen";
- snprintf(configNameStr + 15, 20, "%d", i);
+ snprintf(configNameStr + 15, 5, "%d", i);
iniparser_setstr(GBLsettingsDictionary, configNameStr,
gtk_label_get_text(GTK_LABEL(
isomaster-1.3.7-optflags.diff:
Makefile | 2 +-
bk/Makefile | 2 +-
iniparser-2.17/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE isomaster-1.3.7-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.7
# -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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 27 Dec 2008 13:31:23 -0000 1.10
+++ .cvsignore 14 Jan 2010 20:10:18 -0000 1.11
@@ -1,2 +1,3 @@
isomaster-1.3.4.tar.bz2
text-editor-0.1.tar.gz
+isomaster-1.3.7.tar.bz2
Index: isomaster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/devel/isomaster.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- isomaster.spec 25 Jul 2009 03:39:47 -0000 1.17
+++ isomaster.spec 14 Jan 2010 20:10:18 -0000 1.18
@@ -1,7 +1,7 @@
Name: isomaster
Summary: An easy to use GUI CD image editor
-Version: 1.3.4
-Release: 4%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
License: GPLv2
Group: Applications/File
URL: http://littlesvr.ca/isomaster/
@@ -10,8 +10,9 @@ URL: http://littlesvr.ca/isomaster/
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}, patch updated to work with --fuzzy=0 (has beeing used in Rawhide since October 2008)
-Patch0: isomaster-1.3.4-optflags.diff
-Patch1: isomaster-1.3-desktop.diff
+Patch0: isomaster-1.3.7-optflags.diff
+Patch1: isomaster-1.3.6-desktop.diff
+Patch2: isomaster-1.3.6-snprintf.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#to call viewers for the files
Requires: xdg-utils
@@ -31,6 +32,7 @@ It can open ISO, NRG, and some MDF files
%setup -q -T -D -a 1
%patch0 -p0
%patch1 -p0
+%patch2 -p0
%build
#PREFIX is required to specify a correct dir for icons
@@ -63,10 +65,20 @@ update-desktop-database %{_datadir}/appl
%attr(0755,root,root) %{_bindir}/text-editor.sh
%{_datadir}/%{name}
%doc CHANGELOG.TXT CREDITS.TXT LICENCE.TXT README.TXT TODO.TXT
+#workaround for a problem with bkisofs docs in a separate directory
+%{_datadir}/doc/bkisofs/*.html
%{_datadir}/applications/fedora-isomaster.desktop
%{_mandir}/man1/isomaster.1*
%changelog
+* Tue Jan 05 2010 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.3.7-1
+- updated to 1.3.7
+- patched problem with snprintf and OPTFLAGS from Fedora
+- workaround for a problem with bkisofs docs in a separate directory
+
+* Fri Oct 18 2009 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 1.3.6-1
+- updated to 1.3.6
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/isomaster/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 27 Dec 2008 13:31:23 -0000 1.10
+++ sources 14 Jan 2010 20:10:19 -0000 1.11
@@ -1,2 +1,3 @@
71259bfaaac2000b21b8a480563bf16e isomaster-1.3.4.tar.bz2
55cd78e0d34134821694bac20e77b2a1 text-editor-0.1.tar.gz
+663f2d1a72e2e5f9fdaa30ad585e10f0 isomaster-1.3.7.tar.bz2
More information about the scm-commits
mailing list