rpms/ipe/devel ipe_6.0pre26-initui.cpp.patch, NONE, 1.1 ipe.spec, 1.1, 1.2

[Laurent Rineau (rineau)]

Author: rineau

Update of /cvs/extras/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18931

Modified Files:
	ipe.spec 
Added Files:
	ipe_6.0pre26-initui.cpp.patch 
Log Message:
New Release: 0.7.pre26:
- In %files, use libipe.so.1*, instead of libipe.so.*
- Make sub-package %{name}-doc depend on %{name}.
- Added a patch, ipe_6.0pre26-initui.cpp.patch, to fix temporarely an
  upstream bug: QMenu aboutToshow() signal has a lowercase "a".


ipe_6.0pre26-initui.cpp.patch:

--- NEW FILE ipe_6.0pre26-initui.cpp.patch ---
--- ipe-6.0pre26/src/ipe/initui.cpp~	2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipe/initui.cpp	2006-06-28 10:27:37.000000000 +0200
@@ -773,7 +773,7 @@
   iEditMenu->addAction(docPropsAct);
   iEditMenu->addAction(styleSheetsAct);
 
-  connect(iEditMenu, SIGNAL(AboutToShow()), SLOT(AboutToShowEditMenu()));
+  connect(iEditMenu, SIGNAL(aboutToShow()), SLOT(AboutToShowEditMenu()));
 
   // --------------------------------------------------------------------
   // Object (Mode) menu


Index: ipe.spec
===================================================================
RCS file: /cvs/extras/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipe.spec	9 Jul 2006 16:34:43 -0000	1.1
+++ ipe.spec	9 Jul 2006 22:25:37 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           ipe
 Version:        6.0
-Release:        0.5.%{preversion}%{?dist}
+Release:        0.7.%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
@@ -11,6 +11,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -43,6 +44,7 @@
 %package doc
 Summary: Documentation of Ipe
 Group: Documentation
+Requires: %{name} = %{version}-%{release}
 %description doc
 %{summary}.
 
@@ -50,6 +52,7 @@
 %setup -n %{name}-%{version}%{preversion} -q
 %patch0 -p1 -b .size_t.bak
 %patch1 -p1 -b .plugin.bak
+%patch2 -p1 -b .AboutToShow.bak
 
 %build
 export QTDIR=%{qtdir}
@@ -59,13 +62,13 @@
 # new file config.pri
 rm config.pri
 cat > config.pri <<'__EOF__'
-IPEVERS =       	%{version}
-IPEBINDIR =     	%{_bindir}
-IPELIBDIR =     	%{_libdir}
-IPEHEADERDIR =  	%{_includedir}
-IPELETDIR =     	%{_libdir}/ipe/%{version}/ipelets
-IPELETPATH =    	$${IPELETDIR}
-IPEDOCDIR =     	%{_datadir}/ipe/%{version}/doc
+IPEVERS =               %{version}
+IPEBINDIR =             %{_bindir}
+IPELIBDIR =             %{_libdir}
+IPEHEADERDIR =          %{_includedir}
+IPELETDIR =             %{_libdir}/ipe/%{version}/ipelets
+IPELETPATH =            $${IPELETDIR}
+IPEDOCDIR =             %{_datadir}/ipe/%{version}/doc
 IPELANGDIR =            %{_datadir}/ipe/%{version}/languages
 IPEMANDIR =             %{_mandir}/man1
 IPEFONTMAP =            %{_datadir}/ipe/%{version}/fontmap.xml
@@ -122,9 +125,9 @@
 %files
 %defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
-%{_libdir}/libipe.so.*
-%{_libdir}/libipecanvas.so.*
-%{_libdir}/libipemodel.so.*
+%{_libdir}/libipe.so.1*
+%{_libdir}/libipecanvas.so.1*
+%{_libdir}/libipemodel.so.1*
 %dir %{_libdir}/ipe
 %dir %{_libdir}/ipe/%{version}
 %dir %{_libdir}/ipe/%{version}/ipelets
@@ -156,6 +159,13 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Tue Jul  4 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.7.pre26
+- In %%files, use libipe.so.1*, instead of libipe.so.*
+- Make sub-package %%{name}-doc depend on %%{name}
+
+* Wed Jun 28 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.6.pre26
+- Added a patch, ipe_6.0pre26-initui.cpp.patch, to fix temporarely an upstream bug: QMenu aboutToshow() signal has a lowercase "a".
+
 * Tue Jun 20 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.5.pre26
 - New patch ipe-6.0pre26-ipelet-pro_files.patch: fix the pro files of ipelets: the configshould be "plugin" instead of "dll".
 - Cleanup of the %%files directives: do not own directories which are created by the main package in subpackages.