summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLog.pre-1-012
-rw-r--r--ChangeLog.pre-1-1012
-rw-r--r--ChangeLog.pre-1-212
-rw-r--r--ChangeLog.pre-1-412
-rw-r--r--ChangeLog.pre-1-612
-rw-r--r--ChangeLog.pre-1-812
-rw-r--r--Makefile.am9
-rw-r--r--configure.in1
-rw-r--r--examples/HELLO.utf82
-rw-r--r--modules/Makefile.am5
-rw-r--r--pango.spec.in70
-rw-r--r--pango/Makefile.am4
-rw-r--r--pango/modules.c2
15 files changed, 172 insertions, 6 deletions
diff --git a/.cvsignore b/.cvsignore
index 297c179f..850b88e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,6 +4,7 @@ config.h.in
config.cache
config.log
config.status
+pango.spec
stamp-h
libtool
Makefile
diff --git a/ChangeLog b/ChangeLog
index 49adb8c5..b7815014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 49adb8c5..b7815014 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 49adb8c5..b7815014 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 49adb8c5..b7815014 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 49adb8c5..b7815014 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 49adb8c5..b7815014 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 49adb8c5..b7815014 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,15 @@
+Fri Feb 11 16:04:50 2000 Owen Taylor <otaylor@redhat.com>
+
+ * libpango/Makefile.am: make dist fixups.
+
+ * Makefile.am pango.spec.in: Add a spec file
+
+ * examples/HELLO.utf8: Change Maltese to a different
+ phrase to include some unique Maltese characters.
+
+ * libpango/Makefile.am modules/Makefile.am libpango/modules.c:
+ Move pango.modules file to /var
+
Thu Feb 10 23:45:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/**: Added recent API changes.
diff --git a/Makefile.am b/Makefile.am
index b4176aa5..c8386c7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,10 @@
## Process this file with automake to create Makefile.in.
-SUBDIRS=libpango modules examples docs tools fonts \ No newline at end of file
+SUBDIRS=libpango modules examples docs tools fonts
+
+EXTRA_DIST = \
+ pango.spec.in
+
+dist-hook: pango.spec
+ cp pango.spec $(distdir)
+
diff --git a/configure.in b/configure.in
index 10ba3ecf..b33d12e5 100644
--- a/configure.in
+++ b/configure.in
@@ -51,4 +51,5 @@ examples/Makefile
docs/Makefile
tools/Makefile
fonts/Makefile
+pango.spec
])
diff --git a/examples/HELLO.utf8 b/examples/HELLO.utf8
index f7dc6b15..c7f798e7 100644
--- a/examples/HELLO.utf8
+++ b/examples/HELLO.utf8
@@ -17,7 +17,7 @@ German (Deutsch Süd) Grüß Gott
Greek (Ελληνικά) Γειά σας
Hebrew שלום
Italiano Ciao, Buon giorno
-Maltese Ciao
+Maltese Ċaw, Saħħa
Nederlands, Vlaams Hallo, Dag
Norwegian (Norsk) Hei, God dag
Russian (Русский) Здравствуйте!
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 718707d6..3ec1f65d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -3,5 +3,6 @@
SUBDIRS=basic hangul tamil
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango
- $(top_builddir)/libpango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so > $(DESTDIR)$(sysconfdir)/pango/pango.modules
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/pango
+ $(top_builddir)/libpango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so > $(DESTDIR)$(localstatedir)/lib/pango/pango.modules
+
diff --git a/pango.spec.in b/pango.spec.in
new file mode 100644
index 00000000..36a70426
--- /dev/null
+++ b/pango.spec.in
@@ -0,0 +1,70 @@
+%define prefix /usr
+
+Summary: System for layout and rendering of internationalized text
+Name: pango
+Version: @VERSION@
+Release: 1
+Copyright: LGPL
+Group: System Environment/Libraries
+Source: http://www.pango.org/download/pango-%{version}.tar.gz
+BuildRoot: /var/tmp/pango-%{PACKAGE_VERSION}-root
+
+%description
+A library to handle unicode strings
+
+%package devel
+Summary: System for layout and rendering of internationalized text
+Group: Development/Libraries
+Requires: pango = %{PACKAGE_VERSION}
+Requires: libunicode-devel
+Requires: fribidi-devel
+Requires: XFree86-devel
+
+%description devel
+The pango-devel package includes the static libraries and header files
+for the pango package.
+
+Install pango-devel if you want to develop programs which will use
+pango.
+
+%changelog
+* Fri Feb 11 2000 Owen Taylor <otaylor@redhat.com>
+- Created spec file
+
+%prep
+%setup
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir=/etc --localstatedir=/var
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+if ! test -d /var/lib/pango ; then
+ mkdir -p /var/lib/pango/
+fi
+/usr/bin/pango-querymodules /usr/lib/pango/modules/*.so > /var/lib/pango/pango.modules
+
+%postun -p /sbin/ldconfig
+
+%files
+%doc README AUTHORS COPYING ChangeLog TODO
+%{prefix}/lib/libpango*-*.so
+%{prefix}/bin/pango-querymodules
+%{prefix}/lib/pango/modules/*
+
+%files devel
+%defattr(-, root, root)
+%{prefix}/lib/libpango*.so
+%{prefix}/lib/libpango*.a
+%{prefix}/include/*
+
+
diff --git a/pango/Makefile.am b/pango/Makefile.am
index dd4af86b..66fbe13a 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to create Makefile.in.
-INCLUDES=-DSYSCONFDIR=\"$(sysconfdir)\"
+INCLUDES=-DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
lib_LTLIBRARIES = libpango.la libpangox.la
bin_PROGRAMS = pango-querymodules
@@ -27,6 +27,7 @@ libpangox_la_SOURCES = \
# scheme or the standard libtool scheme.
#
libpango_la_LDFLAGS = -release $(VERSION)
+libpangox_la_LDFLAGS = -release $(VERSION)
include_HEADERS = \
pango.h \
@@ -36,6 +37,7 @@ include_HEADERS = \
pango-font.h \
pango-glyph.h \
pango-layout.h \
+ pango-types.h \
pangox.h
pango_querymodules_SOURCES = \
diff --git a/pango/modules.c b/pango/modules.c
index 54ee1e52..36040000 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -190,7 +190,7 @@ read_modules (void)
module_file = fopen ("pango.modules", "r");
if (!module_file)
{
- module_file = fopen (SYSCONFDIR "/pango/pango.modules", "r");
+ module_file = fopen (LOCALSTATEDIR "/lib/pango/pango.modules", "r");
if (!module_file)
{
fprintf(stderr, "Cannot load module file!\n");
View Lorry Controller Status