Attachment 874890 Details for Bug 1076859 – Use system iniparser

[patch] Use system iniparser

Use-system-iniparser.patch (text/plain), 3.72 KB, created by Ville Skyttä on 2014-03-15 19:42:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-15 19:42:32 UTC

Size: 3.72 KB

patch

obsolete

>From 2e8a152a246362eeb5e8b4ff42a77249c61102bf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 15 Mar 2014 21:41:26 +0200
>Subject: [PATCH] Use system iniparser
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1076859
>---
> isomaster-1.3.9-iniparser3.patch | 12 ++++++++++++
> isomaster-1.3.9-optflags.diff    | 11 -----------
> isomaster.spec                   | 13 ++++++++++---
> 3 files changed, 22 insertions(+), 14 deletions(-)
> create mode 100644 isomaster-1.3.9-iniparser3.patch
>
>diff --git a/isomaster-1.3.9-iniparser3.patch b/isomaster-1.3.9-iniparser3.patch
>new file mode 100644
>index 0000000..86708bd
>--- /dev/null
>+++ b/isomaster-1.3.9-iniparser3.patch
>@@ -0,0 +1,12 @@
>+diff -up isomaster-1.3.9/settings.c~ isomaster-1.3.9/settings.c
>+--- isomaster-1.3.9/settings.c~	2010-01-06 01:59:39.000000000 +0200
>++++ isomaster-1.3.9/settings.c	2014-03-15 21:36:42.373041477 +0200
>+@@ -23,6 +23,8 @@
>+ 
>+ #include "isomaster.h"
>+ 
>++#define iniparser_setstr iniparser_set
>++
>+ /* used by iniparser */
>+ dictionary* GBLsettingsDictionary;
>+ /* home directory with full path or "/" if don't know it */
>diff --git a/isomaster-1.3.9-optflags.diff b/isomaster-1.3.9-optflags.diff
>index 88856dd..5aab54d 100644
>--- a/isomaster-1.3.9-optflags.diff
>+++ b/isomaster-1.3.9-optflags.diff
>@@ -20,14 +20,3 @@
>  
>  # 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
>diff --git a/isomaster.spec b/isomaster.spec
>index 72ff773..b84466c 100644
>--- a/isomaster.spec
>+++ b/isomaster.spec
>@@ -1,7 +1,7 @@
> Name:		isomaster
> Summary:	An easy to use GUI CD image editor
> Version:	1.3.9
>-Release:	6%{?dist}
>+Release:	7%{?dist}
> License:	GPLv2
> Group:		Applications/File
> URL:		http://littlesvr.ca/isomaster/
>@@ -12,6 +12,7 @@ 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.9-optflags.diff
> Patch1:		isomaster-1.3.6-desktop.diff
>+Patch2:		isomaster-1.3.9-iniparser3.patch
> Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> #to call viewers for the files
> Requires:	xdg-utils
>@@ -19,6 +20,7 @@ Requires:	xdg-utils
> BuildRequires:	gtk2-devel
> BuildRequires:	desktop-file-utils
> BuildRequires:	gettext
>+BuildRequires:	iniparser-devel
> 
> %description
> ISO Master: an easy to use graphical CD image editor. 
>@@ -31,14 +33,16 @@ It can open ISO, NRG, and some MDF files but can only save as ISO.
> %setup -q -T -D -a 1
> %patch0 -p0
> %patch1 -p0
>+%patch2 -p1
>+rm -r iniparser*
> 
> %build
> #PREFIX is required to specify a correct dir for icons
>-make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh
>+make %{?_smp_mflags} PREFIX=%{_prefix} OPTFLAGS="%{optflags}" DEFAULT_VIEWER=xdg-open DEFAULT_EDITOR=text-editor.sh USE_SYSTEM_INIPARSER=1
> 
> %install
> rm -fr %{buildroot}
>-make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
>+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} USE_SYSTEM_INIPARSER=1
> cp text-editor.sh %{buildroot}%{_bindir}/text-editor.sh
> 
> %find_lang %{name}
>@@ -74,6 +78,9 @@ update-desktop-database %{_datadir}/applications
> %{_mandir}/man1/isomaster.1*
> 
> %changelog
>+* Sat Mar 15 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.3.9-7
>+- Use system iniparser
>+
> * Tue Sep 03 2013 Jon Ciesla <limburgher@gmail.com> - 1.3.9-6
> - Add Audio and Video to .desktop file.
> - Date fixes.
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1076859: 874890