rpms/ipe/FC-4 ipe_6.0pre26-qmake-defines.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ipe.spec, 1.4, 1.5 sources, 1.2, 1.3 ipe-6.0pre26-ipelet-pro_files.patch, 1.1, NONE ipe-6.0pre26-printf-size_t.patch, 1.1, NONE ipe_6.0pre26-initui.cpp.patch, 1.1, NONE ipe_6.0pre26-libpath.patch, 1.1, NONE

Tue Sep 26 12:28:22 UTC 2006

Author: rineau

Update of /cvs/extras/rpms/ipe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4593/FC-4

Modified Files:
	.cvsignore ipe.spec sources 
Added Files:
	ipe_6.0pre26-qmake-defines.patch 
Removed Files:
	ipe-6.0pre26-ipelet-pro_files.patch 
	ipe-6.0pre26-printf-size_t.patch ipe_6.0pre26-initui.cpp.patch 
	ipe_6.0pre26-libpath.patch 
Log Message:
* Tue Sep 26 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.12.pre27
- New upstream version.
- Remove Patch0 (ipe-6.0pre26-printf-size_t), fixed upstream.
- Remove Patch1 (ipe-6.0pre26-ipelet-pro_files), fixed upstream.
- Remove Patch2 (ipe-6.0pre26-initui.cpp), fixed upstream.
- Remove Patch3 (ipe-6.0pre26-libpath), fixed upstream.


ipe_6.0pre26-qmake-defines.patch:

--- NEW FILE ipe_6.0pre26-qmake-defines.patch ---
--- ipe-6.0pre26/src/ipemodel/ipeprefs.cpp.defines.bak	2006-08-31 19:15:38.000000000 +0200
+++ ipe-6.0pre26/src/ipemodel/ipeprefs.cpp	2006-08-31 19:19:58.000000000 +0200
@@ -108,6 +108,9 @@
   return This;
 }
 
+#define IPE_QUOTE_(x) #x
+#define IPE_QUOTE(x) IPE_QUOTE_(x)
+
 //! Constructor sets up preferences.
 /*! Preferences are read from the preferences file
   (<tt>$HOME/.iperc</tt> on Unix, <tt>$HOME/_ipecfg</tt> on Windows).
@@ -158,12 +161,12 @@
   if (!ipedir.exists())
     home.mkdir(QLatin1String(".ipe"));
   iLatexDir = ipedir.filePath(QLatin1String("latexrun"));
-  iDocDir = QLatin1String(IPEDOCDIR);
-  iFontmap = QLatin1String(IPEFONTMAP);
-  iStdKeysFileName = QLatin1String(IPEKEYSFILE);
-  iBrowser = QLatin1String(IPEBROWSER);
-  iIpeletPath.append(QLatin1String(IPELETPATH));
-  iLangDir = QLatin1String(IPELANGDIR);
+  iDocDir = QLatin1String(IPE_QUOTE(IPEDOCDIR));
+  iFontmap = QLatin1String(IPE_QUOTE(IPEFONTMAP));
+  iStdKeysFileName = QLatin1String(IPE_QUOTE(IPEKEYSFILE));
+  iBrowser = QLatin1String(IPE_QUOTE(IPEBROWSER));
+  iIpeletPath.append(QLatin1String(IPE_QUOTE(IPELETPATH)));
+  iLangDir = QLatin1String(IPE_QUOTE(IPELANGDIR));
 #endif
   iPdfLatex = QLatin1String("pdflatex");
   const char *p;
--- ipe-6.0pre26/src/ipemodel/ipemodel.pro.defines.bak	2006-08-31 19:13:53.000000000 +0200
+++ ipe-6.0pre26/src/ipemodel/ipemodel.pro	2006-08-31 19:14:29.000000000 +0200
@@ -23,12 +23,12 @@
 SOURCES         += ipeprefs.cpp
 SOURCES		+= ipeq.cpp
 # --------------------------------------------------------------------
-unix:DEFINES += IPEDOCDIR=\"$$IPEDOCDIR\"
-unix:DEFINES += IPELETPATH=\"$$IPELETPATH\"
-unix:DEFINES += IPEFONTMAP=\"$$IPEFONTMAP\"
-unix:DEFINES += IPEKEYSFILE=\"$$IPEKEYSFILE\"
-unix:DEFINES += IPEBROWSER=\"$$IPEBROWSER\"
-unix:DEFINES += IPELANGDIR=\"$$IPELANGDIR\"
+unix:DEFINES += IPEDOCDIR=$$IPEDOCDIR
+unix:DEFINES += IPELETPATH=$$IPELETPATH
+unix:DEFINES += IPEFONTMAP=$$IPEFONTMAP
+unix:DEFINES += IPEKEYSFILE=$$IPEKEYSFILE
+unix:DEFINES += IPEBROWSER=$$IPEBROWSER
+unix:DEFINES += IPELANGDIR=$$IPELANGDIR
 # --------------------------------------------------------------------
 unix:target.path = $${IPELIBDIR}
 unix:INSTALLS   += target


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipe/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 16:34:43 -0000	1.2
+++ .cvsignore	26 Sep 2006 12:28:22 -0000	1.3
@@ -1 +1 @@
-ipe-6.0pre26-src.tar.gz
+ipe-6.0pre27-src.tar.gz


Index: ipe.spec
===================================================================
RCS file: /cvs/extras/rpms/ipe/FC-4/ipe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ipe.spec	20 Jul 2006 20:26:48 -0000	1.4
+++ ipe.spec	26 Sep 2006 12:28:22 -0000	1.5
@@ -1,18 +1,20 @@
-%define preversion pre26
+%define preversion pre27
 
 Name:           ipe
 Version:        6.0
-Release:        0.9.%{preversion}%{?dist}
+Release:        0.12.%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
 License:        GPL
 URL:            http://ipe.compgeom.org/
 Source0:        http://ipe.compgeom.org/%{name}-%{version}%{preversion}-src.tar.gz
-Patch0:         ipe-6.0pre26-printf-size_t.patch
-Patch1:         ipe-6.0pre26-ipelet-pro_files.patch
-Patch2:         ipe_6.0pre26-initui.cpp.patch
-Patch3:         ipe_6.0pre26-libpath.patch
+
+###### Patches
+# Avoid the use of double quotes in a macro value.
+Patch4:         ipe_6.0pre26-qmake-defines.patch
+
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -51,10 +53,7 @@
 
 %prep
 %setup -n %{name}-%{version}%{preversion} -q
-%patch0 -p1 -b .size_t.bak
-%patch1 -p1 -b .plugin.bak
-%patch2 -p1 -b .AboutToShow.bak
-%patch3 -p0 -b .libpath.bak
+%patch4 -p1 -b .defines.bak
 
 %build
 export QTDIR=%{qtdir}
@@ -161,6 +160,23 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Tue Sep 26 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.12.pre27
+- New upstream version.
+- Remove Patch0 (ipe-6.0pre26-printf-size_t), fixed upstream.
+- Remove Patch1 (ipe-6.0pre26-ipelet-pro_files), fixed upstream.
+- Remove Patch2 (ipe-6.0pre26-initui.cpp), fixed upstream.
+- Remove Patch3 (ipe-6.0pre26-libpath), fixed upstream.
+
+* Thu Aug 31 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.11.pre26
+- New try to rebuild ipe-6.0pre26 for FC-6 mass rebuild.
+- New patch: ipe_6.0pre26-qmake-defines.patch
+  This patch changes the dealing of macros whose values should contain double
+  quotes (needed under FC-6, which has qmake-4.2).
+- New comments around the patches, to describe them.
+
+* Mon Aug 28 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.10.pre26
+- Rebuild for FC-6.
+
 * Thu Jul 20 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.9.pre26
 - Remove the BR: nas-devel, now that qt4 has stripped -laudio from its pkgconfig files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipe/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 16:34:43 -0000	1.2
+++ sources	26 Sep 2006 12:28:22 -0000	1.3
@@ -1 +1 @@
-cc357dfe2436defa5206256e0aec8d4b  ipe-6.0pre26-src.tar.gz
+3d0d266a55fcf750ee69bbc3d1d1d225  ipe-6.0pre27-src.tar.gz


--- ipe-6.0pre26-ipelet-pro_files.patch DELETED ---


--- ipe-6.0pre26-printf-size_t.patch DELETED ---


--- ipe_6.0pre26-initui.cpp.patch DELETED ---


--- ipe_6.0pre26-libpath.patch DELETED ---


