rpms/ipe/devel ipe-6.0pre26-ipelet-pro_files.patch, NONE, 1.1 ipe-6.0pre26-printf-size_t.patch, NONE, 1.1 ipe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Laurent Rineau (rineau)
fedora-extras-commits at redhat.com
Sun Jul 9 16:34:43 UTC 2006
Author: rineau
Update of /cvs/extras/rpms/ipe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28463/devel
Modified Files:
.cvsignore sources
Added Files:
ipe-6.0pre26-ipelet-pro_files.patch
ipe-6.0pre26-printf-size_t.patch ipe.spec
Log Message:
auto-import ipe-6.0-0.5.pre26 on branch devel from ipe-6.0-0.5.pre26.src.rpm
ipe-6.0pre26-ipelet-pro_files.patch:
--- NEW FILE ipe-6.0pre26-ipelet-pro_files.patch ---
--- ipe-6.0pre26/src/ipelets/align/align.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/align/align.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += align.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/clip/clip.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/clip/clip.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += clip.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/goodies/goodies.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/goodies/goodies.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += goodies.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/image/image.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/image/image.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += qt dll
+CONFIG += qt plugin
# --------------------------------------------------------------------
SOURCES += image.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/kgon/kgon.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/kgon/kgon.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += kgon.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/qvoronoi/qvoronoi.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/qvoronoi/qvoronoi.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += qvoronoi.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/smallest-circle/smallest-circle.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/smallest-circle/smallest-circle.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += smallest-circle.cpp
# --------------------------------------------------------------------
--- ipe-6.0pre26/src/ipelets/templates/templates.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/templates/templates.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll qt
+CONFIG += plugin qt
# --------------------------------------------------------------------
SOURCES += templates.cpp
FORMS += dlguse.ui
--- ipe-6.0pre26/src/ipelets/visibility-polygon/visibility-polygon.pro.plugin 2005-12-14 05:46:00.000000000 +0100
+++ ipe-6.0pre26/src/ipelets/visibility-polygon/visibility-polygon.pro 2006-06-20 09:01:24.000000000 +0200
@@ -3,7 +3,7 @@
include( ../../config.pri )
# --------------------------------------------------------------------
TEMPLATE = lib
-CONFIG += dll
+CONFIG += plugin
# --------------------------------------------------------------------
SOURCES += visibility-polygon.cpp
# --------------------------------------------------------------------
ipe-6.0pre26-printf-size_t.patch:
--- NEW FILE ipe-6.0pre26-printf-size_t.patch ---
diff -ur ipe-6.0pre26/src/ipetoipe/ipetoipe.cpp /home/rineau/RPM/BUILD/ipe-6.0pre26/src/ipetoipe/ipetoipe.cpp
--- ipe-6.0pre26/src/ipetoipe/ipetoipe.cpp 2005-12-14 05:45:59.000000000 +0100
+++ /home/rineau/RPM/BUILD/ipe-6.0pre26/src/ipetoipe/ipetoipe.cpp 2006-05-09 21:01:07.000000000 +0200
@@ -83,7 +83,7 @@
}
if (fm == IpeDocument::EEps && doc->TotalViews() > 1) {
fprintf(stderr,
- "The document contains %d pages, cannot convert to EPS format.\n",
+ "The document contains %zd pages, cannot convert to EPS format.\n",
doc->size());
delete doc;
return 1;
diff -ur ipe-6.0pre26/src/ipetopng/ipetopng.cpp /home/rineau/RPM/BUILD/ipe-6.0pre26/src/ipetopng/ipetopng.cpp
--- ipe-6.0pre26/src/ipetopng/ipetopng.cpp 2005-12-14 05:45:59.000000000 +0100
+++ /home/rineau/RPM/BUILD/ipe-6.0pre26/src/ipetopng/ipetopng.cpp 2006-05-09 20:56:57.000000000 +0200
@@ -73,7 +73,7 @@
}
if (pageNum < 1 || pageNum > int(doc->size())) {
fprintf(stderr,
- "The document contains %d pages, cannot convert page %d.\n",
+ "The document contains %zd pages, cannot convert page %d.\n",
doc->size(), pageNum);
delete doc;
return 1;
--- NEW FILE ipe.spec ---
%define preversion pre26
Name: ipe
Version: 6.0
Release: 0.5.%{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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
# Tips found at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191589#c7
%global qtdir %(pkg-config --variable=prefix QtCore)
Requires: tetex-latex
Requires: urw-fonts
Requires: htmlview
%description
Ipe is a drawing editor for creating figures in PDF or (encapsulated)
Postscript format. It supports making small figures for inclusion into
LaTeX-documents as well as making multi-page PDF presentations that
can be shown on-line with a PDF viewer
%package devel
Summary: Development files and documentation for designing Ipelets
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt4-devel
%description devel
This packages contains the files necessary to develop Ipelets, which are
plugins for the Ipe editor.
%package doc
Summary: Documentation of Ipe
Group: Documentation
%description doc
%{summary}.
%prep
%setup -n %{name}-%{version}%{preversion} -q
%patch0 -p1 -b .size_t.bak
%patch1 -p1 -b .plugin.bak
%build
export QTDIR=%{qtdir}
pushd src
# 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
IPELANGDIR = %{_datadir}/ipe/%{version}/languages
IPEMANDIR = %{_mandir}/man1
IPEFONTMAP = %{_datadir}/ipe/%{version}/fontmap.xml
IPEKEYSFILEDIR = %{_datadir}/ipe/%{version}
IPEKEYSFILE = $${IPEKEYSFILEDIR}/ipekeys.xml
IPEBROWSER=htmlview
FREETYPE_INCLUDE = %{_includedir}/freetype2
CONFIG -= qt
CONFIG += warn_on release
DEFINES += QT_NO_CAST_FROM_ASCII
__EOF__
$QTDIR/bin/qmake -Wlogic main.pro
make %{?_smp_mflags}
popd
# Create desktop file
cat > %{name}.desktop <<EOF
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Ipe
Comment=The Ipe extensible drawing editor
Exec=ipe
Categories=Qt;Application;Graphics;
EOF
%install
rm -rf $RPM_BUILD_ROOT
pushd src
make INSTALL_ROOT=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}/%{version}
cp -f ../tetex-fontmap.xml $RPM_BUILD_ROOT/usr/share/%{name}/%{version}/fontmap.xml
popd
# Install desktop file
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
%{name}.desktop
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc readme.txt gpl.txt news.txt
%{_libdir}/libipe.so.*
%{_libdir}/libipecanvas.so.*
%{_libdir}/libipemodel.so.*
%dir %{_libdir}/ipe
%dir %{_libdir}/ipe/%{version}
%dir %{_libdir}/ipe/%{version}/ipelets
%{_libdir}/ipe/%{version}/ipelets/*.so
%dir %{_datadir}/ipe
%dir %{_datadir}/ipe/%{version}
%{_datadir}/ipe/%{version}/*.xml
%{_bindir}/ipe5toxml
%{_bindir}/ipe
%{_bindir}/ipetoipe
%{_bindir}/ipetopng
%{_bindir}/figtoipe
%{_mandir}/man1/ipe5toxml.1*
%{_mandir}/man1/ipe.1*
%{_mandir}/man1/ipetoipe.1*
%{_mandir}/man1/ipetopng.1*
%{_mandir}/man1/figtoipe.1*
%{_datadir}/applications/*%{name}*.desktop
%files devel
%doc readme.txt gpl.txt news.txt
%{_includedir}/*.h
%{_libdir}/libipe.so
%{_libdir}/libipecanvas.so
%{_libdir}/libipemodel.so
%files doc
%doc readme.txt gpl.txt news.txt
%{_datadir}/ipe/%{version}/doc
%changelog
* 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.
* Sun May 28 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.4.pre26
- No longer hardcode qt4 prefix. Use pkg-config instead.
* Sun May 21 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.3.pre26
- Added a desktop file for Ipe.
* Sun May 21 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.2.pre26
- Fix directories ownership.
- ipelets/*.so are now in -devel.
- Creation of -doc subpackage.
* Tue May 9 2006 Laurent Rineau <laurent.rineau__fedora_extras at normalesup.org> - 6.0-0.1.pre26
- Initial revision.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Jul 2006 16:33:06 -0000 1.1
+++ .cvsignore 9 Jul 2006 16:34:43 -0000 1.2
@@ -0,0 +1 @@
+ipe-6.0pre26-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Jul 2006 16:33:06 -0000 1.1
+++ sources 9 Jul 2006 16:34:43 -0000 1.2
@@ -0,0 +1 @@
+cc357dfe2436defa5206256e0aec8d4b ipe-6.0pre26-src.tar.gz
More information about the fedora-extras-commits
mailing list