Enlightenment CVS committal
Author : mej
Project : e16
Module : fnlib
Dir : e16/fnlib
Modified Files:
ChangeLog config.h.in configure.in fnlib.spec.in
Log Message:
Tue Jul 29 22:37:39 2003 Michael Jennings (mej)
I'm not sure it's worth it, but hey... Spec file/build cleanups from
Matthias Brill <[EMAIL PROTECTED]>.
===================================================================
RCS file: /cvsroot/enlightenment/e16/fnlib/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- ChangeLog 17 Aug 1999 23:43:13 -0000 1.1.1.1
+++ ChangeLog 30 Jul 2003 02:39:09 -0000 1.2
@@ -39,3 +39,9 @@
snprintf doesn't work under non gcc-derivitive compilers.
moved to sprintf. since sprintf is scattered through here
anyways it'll do for now.
+----------------------------------------------------------------------
+Tue Jul 29 22:37:39 2003 Michael Jennings (mej)
+
+I'm not sure it's worth it, but hey... Spec file/build cleanups from
+Matthias Brill <[EMAIL PROTECTED]>.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e16/fnlib/config.h.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- config.h.in 17 Aug 1999 23:43:13 -0000 1.1.1.1
+++ config.h.in 30 Jul 2003 02:39:09 -0000 1.2
@@ -18,6 +18,9 @@
/* Define if you have the <dirent.h> header file. */
#undef HAVE_DIRENT_H
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
/* Define if you have the <ndir.h> header file. */
#undef HAVE_NDIR_H
===================================================================
RCS file: /cvsroot/enlightenment/e16/fnlib/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.in 18 Oct 1999 18:14:33 -0000 1.2
+++ configure.in 30 Jul 2003 02:39:09 -0000 1.3
@@ -4,8 +4,8 @@
AM_INIT_AUTOMAKE(fnlib, 0.5)
-AM_PROG_LIBTOOL
AC_PROG_CC
+AM_PROG_LIBTOOL
dnl AM_PATH_GTK(1.0.1,
dnl GDK_FNLIB="gdk_fnlib",
===================================================================
RCS file: /cvsroot/enlightenment/e16/fnlib/fnlib.spec.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- fnlib.spec.in 17 Aug 1999 23:43:13 -0000 1.1.1.1
+++ fnlib.spec.in 30 Jul 2003 02:39:09 -0000 1.2
@@ -1,31 +1,24 @@
-# Note that this is NOT a relocatable package
-%define ver @VERSION@
-%define rel 1
-%define prefix /usr
-
Summary: Color font rendering library for X11R6.
Name: fnlib
-Version: %ver
-Release: %rel
+Version: @VERSION@
+Release: 2
Copyright: LGPL
Group: System Environment/Libraries
-Source: ftp://www.rasterman.com/pub/enlightenment/libs/fnlib/fnlib-%{ver}.tar.gz
-Obsoletes: Fnlib
-BuildRoot: /var/tmp/fnlib-%{ver}-root
-
+Source: ftp://www.rasterman.com/pub/enlightenment/libs/fnlib/fnlib-%{version}.tar.gz
URL: http://www.rasterman.com/
-Docdir: %{prefix}/doc
Requires: imlib
+Obsoletes: Fnlib
+BuildRoot: /var/tmp/fnlib-%{version}-root
%description
-Fnlib is a library that provides full, scalable 24-bit color font
+Fnlib is a library that provides full, scalable 24-bit color font
rendering abilities for X.
%package devel
Summary: Headers, static libraries and documentation for Fnlib.
Group: Development/Libraries
Requires: fnlib
-Obsoletes: Fnlib
+Obsoletes: Fnlib, Fnlib-devel
%description devel
Headers, static libraries and documentation for Fnlib.
@@ -34,13 +27,17 @@
%setup
%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
+CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS
+%configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} \
+ --includedir=%{_includedir} --datadir=%{_datadir} \
+ --sysconfdir=%{_sysconfdir}
make
%install
rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+make DESTDIR=$RPM_BUILD_ROOT install
%clean
rm -rf $RPM_BUILD_ROOT
@@ -51,28 +48,22 @@
%files
%defattr(-, root, root)
-
%doc README
-
-%config %{prefix}/etc/fnrc
-%{prefix}/lib/lib*.so.*
-%{prefix}/share/fnlib_fonts/*
+%config %{_sysconfdir}/fnrc
+%{_libdir}/lib*.so.*
+%{_datadir}/fnlib_fonts/*
%files devel
%defattr(-, root, root)
-
%doc doc/index.html
%doc doc/fontinfo.README
-
-%{prefix}/lib/lib*.so
-%{prefix}/lib/*a
-%{prefix}/include/*
+%{_libdir}/lib*.so
+%{_libdir}/*a
+%{_includedir}/*
%changelog
-
* Fri Feb 12 1999 Michael Fulbright <[EMAIL PROTECTED]>
- built against imlib 1.9.3
-
* Thu Jan 21 1999 The Rasterman <[EMAIL PROTECTED]>
- added spec file to CVS
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
