rpms/MagicPoint/FC-4 MagicPoint.spec,1.1,1.2
Colin Charles (byte)
fedora-extras-commits at redhat.com
Thu Aug 4 12:05:44 UTC 2005
Author: byte
Update of /cvs/extras/rpms/MagicPoint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13260
Modified Files:
MagicPoint.spec
Log Message:
* Thu Aug 4 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-2
- Removed Patch12 to fix undefined operation
- Bump spec to somewhat match work from Rui Miguel Silva Seabra <rms at 1407.org>
- Remove requirement on VFlib2, seeing that we disable it in configure
Index: MagicPoint.spec
===================================================================
RCS file: /cvs/extras/rpms/MagicPoint/FC-4/MagicPoint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MagicPoint.spec 27 Jun 2005 05:48:40 -0000 1.1
+++ MagicPoint.spec 4 Aug 2005 12:05:42 -0000 1.2
@@ -3,26 +3,30 @@
%define x11datadir %{x11dir}/lib
%define x11mandir %{x11dir}/man
-Summary: X based presentation software.
-Name: MagicPoint
-Version: 1.11b
-Release: 2
-License: BSD
-Group: Applications/Productivity
-URL: http://www.mew.org/mgp
-Source: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz
-Patch1: magicpoint-1.08a-redhat.patch
-Patch2: magicpoint-1.09a-rpath.patch
-Patch3: magicpoint-1.11a-fix-gcc-warnings.patch
-Patch6: magicpoint-1.10a-longline.patch
-Patch10: magicpoint-1.10a-fix-usleep.patch
-Patch11: magicpoint-1.10a-fix-gcc34.patch
-Patch12: magicpoint-1.11b-fix-undefined-operation.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: freetype-devel VFlib2-devel
-BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel
-Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8
+Name: MagicPoint
+Version: 1.11b
+Release: 2%{?dist}
+Summary: X based presentation software
+
+Group: Applications/Productivity
+License: BSD
+URL: http://www.mew.org/mgp
+Source0: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz
+
+Patch1: magicpoint-1.08a-redhat.patch
+Patch2: magicpoint-1.09a-rpath.patch
+Patch3: magicpoint-1.11a-fix-gcc-warnings.patch
+Patch6: magicpoint-1.10a-longline.patch
+Patch10: magicpoint-1.10a-fix-usleep.patch
+Patch11: magicpoint-1.10a-fix-gcc34.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildPrereq: freetype-devel
+BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex
+#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8
+Requires: imlib
Obsoletes: mgp,magicpoint
+Provides: mgp,magicpoint
%description
MagicPoint is an X11 based presentation tool. MagicPoint's
@@ -37,13 +41,12 @@
%patch6 -p1 -b .longline
%patch10 -p1 -b .usleep
%patch11 -p1 -b .gcc34
-%patch12 -p1 -b .undef-op
%build
CFLAGS=-I/usr/include/freetype1/freetype
autoconf
cp /usr/share/libtool/config.{sub,guess} .
-%configure --prefix=/usr/X11R6 --enable-gif
+%configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib
xmkmf -a
make
rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore
@@ -51,22 +54,24 @@
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT
+strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1`
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
-%doc COPYRIGHT README SYNTAX USAGE
-%doc sample
+%defattr(755,root,root,755)
%{x11bindir}/*
+%defattr(644,root,root,755)
+%doc COPYRIGHT README SYNTAX USAGE sample
%{x11datadir}/X11/mgp
%{x11mandir}/*/*
%changelog
-* Thu Nov 11 2004 Akira TAGOH <tagoh at redhat.com> - 1.11b-2
-- magicpoint-1.11b-fix-undefined-operation.patch: applied to fix a gcc warning.
- (#137527)
+* Thu Aug 4 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-2
+- Removed Patch12 to fix undefined operation
+- Bump spec to somewhat match work from Rui Miguel Silva Seabra <rms at 1407.org>
+- Remove requirement on VFlib2, seeing that we disable it in configure
* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 1.11b-1
- New upstream release.
More information about the fedora-extras-commits
mailing list