rpms/ipe/devel ipe.spec,1.25,1.26

[Laurent Rineau]

Author: rineau

Update of /cvs/pkgs/rpms/ipe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13532

Modified Files:
	ipe.spec 
Log Message:
Upgrade spec file to last new major upstream release.
One problem lasts: use %{optflags}...



Index: ipe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipe/devel/ipe.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ipe.spec	20 Aug 2009 17:22:44 -0000	1.25
+++ ipe.spec	12 Jan 2010 00:00:24 -0000	1.26
@@ -1,8 +1,6 @@
-%define preversion 32patch1
-
 Name:           ipe
-Version:        6.0
-Release:        0.32.pre%{preversion}%{?dist}
+Version:        7.0.10
+Release:        1%{?dist}
 Summary:        Drawing editor for creating figures in PDF or PostScript formats
 
 Group:          Applications/Publishing
@@ -11,14 +9,7 @@ Group:          Applications/Publishing
 License:        GPLv2+ with exceptions
 #
 URL:            http://tclab.kaist.ac.kr/ipe/
-Source0:        http://luaforge.net/frs/download.php/4052/ipe-6.0pre%{preversion}-src.tar.gz
-
-Patch1:         ipe-6.0pre30-gcc43.patch
-
-# Fedora specific patch. It removes the runtime test of the Freetype
-# library version. Freetype is supposed to bump its soname if the ABI is
-# incompatible.
-Patch10:        ipe-6.0pre28-no-freetype-version-check.patch
+Source0:        http://dl.sourceforge.net/project/ipe7/ipe/ipe-%{version}-src.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +24,7 @@ Requires:       tex(latex)
 Requires:       urw-fonts
 Requires:       xdg-utils
 
-Provides:       ipe(api) = 5.99.%{preversion}pre
+Provides:       ipe(api) = %{version}
 Provides:       ipetoipe = %{version}
 Provides:       ipetopng = %{version}
 
@@ -62,9 +53,7 @@ Requires: %{name} = %{version}-%{release
 %{summary}.
 
 %prep
-%setup -n %{name}-%{version}pre%{preversion} -q
-%patch1 -p1 -b '.gcc43'
-%patch10 -p1 -b '.no-freetype-check'
+%setup -n %{name}-%{version} -q
 
 # fix files permissions
 find src -type f -exec chmod -x {} +
@@ -74,34 +63,13 @@ 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 =            xdg-open
-
-FREETYPE_INCLUDE =      %{_includedir}/freetype2
-
-CONFIG      -= qt
-CONFIG      += warn_on release
-DEFINES     += QT_NO_CAST_FROM_ASCII
-__EOF__
-
-# Call qmake.
-$QTDIR/bin/qmake -Wlogic main.pro
-# then make. (The CXX= option allows to change the compiler with rpm macros.)
-make %{?_smp_mflags} CXX=%{__cxx}
+for target in ipeui ipe all; do
+  make %{_smp_mflags} $target \
+     LUA_CFLAGS="`pkg-config --cflags lua`" \
+     LUA_LIBS="`pkg-config --libs lua`" \
+     IPEPREFIX="%{_usr}"
+#     CXXFLAGS+="%{optflags}" \
+done
 
 popd 
 
@@ -120,9 +88,9 @@ EOF
 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
+make INSTALL_ROOT=$RPM_BUILD_ROOT install \
+     IPEPREFIX="%{_usr}" \
+     INSTALL_PROGRAMS="install -m 0755"
 popd
 
 # Install desktop file
@@ -131,10 +99,6 @@ desktop-file-install --vendor fedora    
         --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
@@ -146,33 +110,50 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
-%{_libdir}/libipe.so.1*
-%{_libdir}/libipecanvas.so.1*
-%{_libdir}/libipemodel.so.1*
+
+%{_bindir}/ipe
+%{_bindir}/ipe6upgrade
+%{_bindir}/ipeextract
+%{_bindir}/iperender
+%{_bindir}/ipetoipe
+%{_bindir}/ipe-update-master
+%{_bindir}/ipeview
+
+%{_libdir}/libipe.so.%{version}
+%{_libdir}/libipeui.so.%{version}
+%{_libdir}/libipecairo.so.%{version}
+%{_libdir}/libipeqtcanvas.so.%{version}
+%{_libdir}/libipelua.so.%{version}
+
 %dir %{_libdir}/ipe
 %dir %{_libdir}/ipe/%{version}
 %dir %{_libdir}/ipe/%{version}/ipelets
 %{_libdir}/ipe/%{version}/ipelets/*.so
+%{_libdir}/ipe/%{version}/ipelets/*.lua
+
 %dir %{_datadir}/ipe
 %dir %{_datadir}/ipe/%{version}
-%{_datadir}/ipe/%{version}/*.xml
-%{_bindir}/ipe
-%{_bindir}/ipetoipe
-%{_bindir}/ipetopng
-#%{_bindir}/figtoipe
-%{_mandir}/man1/ipe.1*
-%{_mandir}/man1/ipetoipe.1*
-%{_mandir}/man1/ipetopng.1*
-#%{_mandir}/man1/figtoipe.1*
+%{_datadir}/ipe/%{version}/icons
+%{_datadir}/ipe/%{version}/lua
+%{_datadir}/ipe/%{version}/styles
+
 %{_datadir}/applications/*%{name}*.desktop
 
+%{_mandir}/man1/ipe.1.gz
+%{_mandir}/man1/ipe6upgrade.1.gz
+%{_mandir}/man1/ipeextract.1.gz
+%{_mandir}/man1/iperender.1.gz
+%{_mandir}/man1/ipetoipe.1.gz
+
 %files devel
 %defattr(-,root,root,-)
 %doc readme.txt gpl.txt news.txt
 %{_includedir}/*.h
 %{_libdir}/libipe.so
-%{_libdir}/libipecanvas.so
-%{_libdir}/libipemodel.so
+%{_libdir}/libipeui.so
+%{_libdir}/libipecairo.so
+%{_libdir}/libipeqtcanvas.so
+%{_libdir}/libipelua.so
 
 %files doc
 %defattr(-,root,root,-)
@@ -180,6 +161,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ipe/%{version}/doc
 
 %changelog
+* Tue Jan 12 2010  <Laurent.Rineau__fedora at normalesup.org> - 7.0.10-1
+- New upstream major version
+
+* Sun Jan 10 2010  <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.33.pre32patch1%{?dist}
+- Update URL of Source0
+
 * Thu Aug 20 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 6.0-0.32.pre32patch1%{?dist}
 - New upstream release
 - ipe5toxml no longer shipped