rpms/ipe/devel ipe-6.0pre30-gcc43.patch, NONE, 1.1 ipe.spec, 1.16, 1.17
Laurent Rineau (rineau)
fedora-extras-commits at redhat.com
Thu Feb 14 15:10:44 UTC 2008
- Previous message (by thread): rpms/inkscape/devel inkscape-0.46pre1-ocal1.patch, NONE, 1.1 inkscape-0.46pre1-ocal2.patch, NONE, 1.1 inkscape.spec, 1.44, 1.45
- Next message (by thread): rpms/hdhomerun/devel .cvsignore, 1.4, 1.5 hdhomerun.spec, 1.4, 1.5 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rineau
Update of /cvs/pkgs/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7957
Modified Files:
ipe.spec
Added Files:
ipe-6.0pre30-gcc43.patch
Log Message:
* Thu Feb 14 2008 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.24.pre30%{?dist}
- Fixes for gcc-4.3.
ipe-6.0pre30-gcc43.patch:
--- NEW FILE ipe-6.0pre30-gcc43.patch ---
diff -up ipe-6.0pre30/src/include/ipebase.h~ ipe-6.0pre30/src/include/ipebase.h
--- ipe-6.0pre30/src/include/ipebase.h~ 2007-11-26 18:18:54.000000000 +0100
+++ ipe-6.0pre30/src/include/ipebase.h 2008-02-14 15:40:54.000000000 +0100
@@ -38,6 +38,7 @@
#include <map>
#include <list>
#include <algorithm>
+#include <string.h>
// --------------------------------------------------------------------
Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ipe.spec 14 Feb 2008 13:30:50 -0000 1.16
+++ ipe.spec 14 Feb 2008 15:10:00 -0000 1.17
@@ -2,7 +2,7 @@
Name: ipe
Version: 6.0
-Release: 0.23.pre%{preversion}%{?dist}
+Release: 0.24.pre%{preversion}%{?dist}
Summary: The Ipe extensible drawing editor
Group: Applications/Publishing
@@ -12,6 +12,7 @@
#
URL: http://tclab.kaist.ac.kr/ipe/
Source0: http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
+Patch1: ipe-6.0pre30-gcc43.patch
Patch10: ipe-6.0pre28-no-freetype-version-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,7 @@
%prep
%setup -n %{name}-%{version}pre%{preversion} -q
+%patch1 -p1 -b '.gcc43'
%patch10 -p1 -b .no-freetype-check
%build
@@ -87,8 +89,10 @@
DEFINES += QT_NO_CAST_FROM_ASCII
__EOF__
+# Call qmake.
$QTDIR/bin/qmake -Wlogic main.pro
-make %{?_smp_mflags}
+# then make. (The CXX= option allows to change the compiler with rpm macros.)
+make %{?_smp_mflags} CXX=%{__cxx}
popd
@@ -118,6 +122,10 @@
--add-category X-Fedora \
%{name}.desktop
+# Remove backup files. qmake incorrectly installed the whole include/
+# sub-directory.
+rm -f ${RPM_BUILD_ROOT}%{_includedir}/*.gcc43
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -163,6 +171,9 @@
%{_datadir}/ipe/%{version}/doc
%changelog
+* Thu Feb 14 2008 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.24.pre30%{?dist}
+- Fixes for gcc-4.3.
+
* Tue Dec 4 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.23.pre30%{?dist}
- New upstream release.
- Patch "pre28-patch1" is now obsolete.
- Previous message (by thread): rpms/inkscape/devel inkscape-0.46pre1-ocal1.patch, NONE, 1.1 inkscape-0.46pre1-ocal2.patch, NONE, 1.1 inkscape.spec, 1.44, 1.45
- Next message (by thread): rpms/hdhomerun/devel .cvsignore, 1.4, 1.5 hdhomerun.spec, 1.4, 1.5 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list