rpms/ipe/devel .cvsignore, 1.4, 1.5 ipe.spec, 1.15, 1.16 sources, 1.4, 1.5

[Laurent Rineau (rineau)]

Author: rineau

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

Modified Files:
	.cvsignore ipe.spec sources 
Log Message:
* 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.
- Change the License: tag, to states that there is an exception for
  CGAL. The license is now "GPLv2+ with exceptions".



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jan 2007 18:27:47 -0000	1.4
+++ .cvsignore	14 Feb 2008 13:30:50 -0000	1.5
@@ -1 +1 @@
-ipe-6.0pre28-src.tar.gz
+ipe-6.0pre30-src.tar.gz


Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ipe.spec	17 Nov 2007 18:50:35 -0000	1.15
+++ ipe.spec	14 Feb 2008 13:30:50 -0000	1.16
@@ -1,16 +1,18 @@
-%define preversion 28
+%define preversion 30
 
 Name:           ipe
 Version:        6.0
-Release:        0.22.pre%{preversion}%{?dist}
+Release:        0.23.pre%{preversion}%{?dist}
 Summary:        The Ipe extensible drawing editor
 
 Group:          Applications/Publishing
-License:        GPLv2+
+#
+# GPLv2, with an exception for the CGAL libraries.
+License:        GPLv2+ with exceptions
+#
 URL:            http://tclab.kaist.ac.kr/ipe/
 Source0:        http://tclab.kaist.ac.kr/ipe/%{name}-%{version}pre%{preversion}-src.tar.gz
 Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
-Patch100:       ipe-6.0pre28-patch1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -24,7 +26,10 @@
 Requires:       urw-fonts
 Requires:       xdg-utils
 
-Provides:       ipe(api) = 5.99.%{preversion}.1pre
+Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipetoipe = %{version}
+Provides:       ipetopng = %{version}
+Provides:       ipe5toxml = %{version}
 
 %description
 Ipe is a drawing editor for creating figures in PDF or (encapsulated)
@@ -52,7 +57,6 @@
 %prep
 %setup -n %{name}-%{version}pre%{preversion} -q
 %patch10 -p1 -b .no-freetype-check
-%patch100 -p1 -b .pre28-patch1
 
 %build
 export QTDIR=%{qtdir}
@@ -139,18 +143,17 @@
 %{_bindir}/ipe
 %{_bindir}/ipetoipe
 %{_bindir}/ipetopng
-%{_bindir}/figtoipe
+#%{_bindir}/figtoipe
 %{_mandir}/man1/ipe5toxml.1*
 %{_mandir}/man1/ipe.1*
 %{_mandir}/man1/ipetoipe.1*
 %{_mandir}/man1/ipetopng.1*
-%{_mandir}/man1/figtoipe.1*
+#%{_mandir}/man1/figtoipe.1*
 %{_datadir}/applications/*%{name}*.desktop
 
 %files devel
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
-%exclude %{_includedir}/*.h.pre28-patch1
 %{_libdir}/libipe.so
 %{_libdir}/libipecanvas.so
 %{_libdir}/libipemodel.so
@@ -160,6 +163,12 @@
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* 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.
+- Change the License: tag, to states that there is an exception for
+  CGAL. The license is now "GPLv2+ with exceptions".
+
 * Sat Nov 17 2007 Laurent Rineau <laurent.rineau__fedora at normalesup.org> - 6.0-0.22.pre28%{?dist}
 - Make ipe use xdg-open (from package xdg-utils), instead of htmlview.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jan 2007 18:27:47 -0000	1.4
+++ sources	14 Feb 2008 13:30:50 -0000	1.5
@@ -1 +1 @@
-b0b7d0c935b9687984d2f28b1c8b7226  ipe-6.0pre28-src.tar.gz
+d0b203f1cbda664c76681b79684bde76  ipe-6.0pre30-src.tar.gz