OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Nov-2003 21:19:59
Branch: HEAD Handle: 2003110720195800
Added files:
openpkg-src/freetype freetype.patch
Modified files:
openpkg-src/freetype freetype.spec
Log:
cleanup packaging and resulting filesystem layout
Summary:
Revision Changes Path
1.1 +104 -0 openpkg-src/freetype/freetype.patch
1.37 +17 -3 openpkg-src/freetype/freetype.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.patch
============================================================================
$ cvs diff -u -r0 -r1.1 freetype.patch
--- /dev/null 2003-11-07 21:19:59.000000000 +0100
+++ freetype.patch 2003-11-07 21:19:59.000000000 +0100
@@ -0,0 +1,104 @@
+Index: builds/unix/freetype-config.in
+--- builds/unix/freetype-config.in.orig 2003-04-24 07:45:59.000000000 +0200
++++ builds/unix/freetype-config.in 2003-11-07 19:50:30.000000000 +0100
+@@ -79,7 +79,7 @@
+ fi
+
+ if test "$echo_cflags" = "yes" ; then
+- cflags="[EMAIL PROTECTED]@/freetype2"
++ cflags="[EMAIL PROTECTED]@"
+ if test "@includedir@" != "/usr/include" ; then
+ echo $cflags [EMAIL PROTECTED]@
+ else
+Index: builds/unix/freetype2.in
+--- builds/unix/freetype2.in.orig 2003-06-01 23:30:03.000000000 +0200
++++ builds/unix/freetype2.in 2003-11-07 19:50:46.000000000 +0100
+@@ -8,4 +8,4 @@
+ Version: @ft_version@
+ Requires:
+ Libs: -L${libdir} -lfreetype @LIBZ@
+-Cflags: -I${includedir}/freetype2
++Cflags: -I${includedir}
+Index: builds/unix/install.mk
+--- builds/unix/install.mk.orig 2003-06-09 06:46:27.000000000 +0200
++++ builds/unix/install.mk 2003-11-07 19:51:34.000000000 +0100
+@@ -26,28 +26,28 @@
+ install: $(PROJECT_LIBRARY)
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(DESTDIR)$(libdir)/pkgconfig \
+- $(DESTDIR)$(includedir)/freetype2/freetype/config \
+- $(DESTDIR)$(includedir)/freetype2/freetype/internal \
+- $(DESTDIR)$(includedir)/freetype2/freetype/cache \
++ $(DESTDIR)$(includedir)/freetype/config \
++ $(DESTDIR)$(includedir)/freetype/internal \
++ $(DESTDIR)$(includedir)/freetype/cache \
+ $(DESTDIR)$(bindir) \
+ $(DESTDIR)$(datadir)/aclocal
+ $(LIBTOOL) --mode=install $(INSTALL) \
+ $(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
+ -for P in $(PUBLIC_H) ; do \
+ $(INSTALL_DATA) \
+- $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
++ $$P $(DESTDIR)$(includedir)/freetype ; \
+ done
+ -for P in $(BASE_H) ; do \
+ $(INSTALL_DATA) \
+- $$P $(DESTDIR)$(includedir)/freetype2/freetype/internal ; \
++ $$P $(DESTDIR)$(includedir)/freetype/internal ; \
+ done
+ -for P in $(CONFIG_H) ; do \
+ $(INSTALL_DATA) \
+- $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
++ $$P $(DESTDIR)$(includedir)/freetype/config ; \
+ done
+ -for P in $(CACHE_H) ; do \
+ $(INSTALL_DATA) \
+- $$P $(DESTDIR)$(includedir)/freetype2/freetype/cache ; \
++ $$P $(DESTDIR)$(includedir)/freetype/cache ; \
+ done
+ $(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
+ $(DESTDIR)$(includedir)/ft2build.h
+@@ -61,15 +61,15 @@
+
+ uninstall:
+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
+- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
+- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
+- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
+- -$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
+- -$(DELDIR) $(DESTDIR)$(includedir)/freetype2
++ -$(DELETE) $(DESTDIR)$(includedir)/freetype/cache/*
++ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/cache
++ -$(DELETE) $(DESTDIR)$(includedir)/freetype/config/*
++ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/config
++ -$(DELETE) $(DESTDIR)$(includedir)/freetype/internal/*
++ -$(DELDIR) $(DESTDIR)$(includedir)/freetype/internal
++ -$(DELETE) $(DESTDIR)$(includedir)/freetype/*
++ -$(DELDIR) $(DESTDIR)$(includedir)/freetype
++ -$(DELDIR) $(DESTDIR)$(includedir)
+ -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
+ -$(DELETE) $(DESTDIR)$(bindir)/freetype-config
+ -$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
+Index: include/freetype/freetype.h
+--- include/freetype/freetype.h.orig 2003-11-03 21:12:39.000000000 +0100
++++ include/freetype/freetype.h 2003-11-07 19:49:05.000000000 +0100
+@@ -16,15 +16,6 @@
+ /***************************************************************************/
+
+
+-#ifndef FT_FREETYPE_H
+-#error "`ft2build.h' hasn't been included yet!"
+-#error "Please always use macros to include FreeType header files."
+-#error "Example:"
+-#error " #include <ft2build.h>"
+-#error " #include FT_FREETYPE_H"
+-#endif
+-
+-
+ #ifndef __FREETYPE_H__
+ #define __FREETYPE_H__
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 freetype.spec
--- openpkg-src/freetype/freetype.spec 7 Nov 2003 08:02:00 -0000 1.36
+++ openpkg-src/freetype/freetype.spec 7 Nov 2003 20:19:58 -0000 1.37
@@ -25,7 +25,7 @@
# package information
Name: freetype
-Summary: A TrueType Font (TTF) Rendering Library
+Summary: TrueType Font (TTF) Rendering Library
URL: http://www.freetype.org/
Vendor: Free Software Foundation
Packager: The OpenPKG Project
@@ -37,6 +37,7 @@
# list of sources
Source0: ftp://ftp.freetype.org/freetype/freetype2/freetype-%{version}.tar.gz
+Patch0: freetype.patch
# build information
Prefix: %{l_prefix}
@@ -47,10 +48,20 @@
AutoReqProv: no
%description
- FreeType is a full-featured rendering library for TrueType Fonts (TTF).
+ FreeType is a software font engine that is designed to be small,
+ efficient, highly customizable and portable while capable of
+ producing high-quality output (glyph images). It can be used in
+ graphics libraries, display servers, font conversion tools, text
+ image generation tools, and many other products as well. FreeType
+ is a font service and doesn't provide APIs to perform higher-level
+ features, like text layout or graphics processing (e.g. colored text
+ rendering, "hollowing", etc..). However, it greatly simplifies these
+ tasks by providing a simple, easy to use and uniform interface to
+ access the content of font files.
%prep
%setup -q
+ %patch -p0
%build
%{l_make} %{l_mflags} setup \
@@ -62,7 +73,10 @@
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*.orig
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/lib/pkgconfig' \
+ '%not %dir %{l_prefix}/share/aclocal'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
