Fix makefile, rpm package

2 files changed, 15 insertions, 6 deletions

diff --git a/unicode/Makefile.am b/unicode/Makefile.am
index 588491b..3f83b8a 100644
--- a/unicode/Makefile.am
+++ b/unicode/Makefile.am
@@ -45,7 +45,7 @@ update-www-htmlent:
 
 lib_LTLIBRARIES=libunicode.la
 include_HEADERS=unicode.h
-man_MANS=man/courier-unicode.7 man/unicode[\:][\:]iconvert[\:][\:]convert.3 man/unicode[\:][\:]iconvert[\:][\:]convert_tocase.3 man/unicode[\:][\:]iconvert[\:][\:]fromu.3 man/unicode[\:][\:]iconvert[\:][\:]tou.3 man/unicode[\:][\:]linebreak_callback_base.3 man/unicode[\:][\:]linebreak_callback_save_buf.3 man/unicode[\:][\:]linebreak_iter.3 man/unicode[\:][\:]linebreakc_callback_base.3 man/unicode[\:][\:]linebreakc_iter.3 man/unicode[\:][\:]wordbreak_callback_base.3 man/unicode_convert.3 man/unicode_convert_deinit.3 man/unicode_convert_fromu_init.3 man/unicode_convert_fromu_tobuf.3 man/unicode_convert_fromutf8.3 man/unicode_convert_init.3 man/unicode_convert_tobuf.3 man/unicode_convert_tocase.3 man/unicode_convert_tocbuf_fromutf8_init.3 man/unicode_convert_tocbuf_init.3 man/unicode_convert_tocbuf_toutf8_init.3 man/unicode_convert_tou_init.3 man/unicode_convert_tou_tobuf.3 man/unicode_convert_toutf8.3 man/unicode_convert_uc.3 man/unicode_default_chset.3 man/unicode_grapheme_break.3 man/unicode_html40ent_lookup.3 man/unicode_isspace.3 man/unicode_lb_end.3 man/unicode_lb_init.3 man/unicode_lb_next.3 man/unicode_lb_next_cnt.3 man/unicode_lb_set_opts.3 man/unicode_lbc_end.3 man/unicode_lbc_init.3 man/unicode_lbc_next.3 man/unicode_lbc_next_cnt.3 man/unicode_lbc_set_opts.3 man/unicode_lc.3 man/unicode_tc.3 man/unicode_u_ucs2_native.3 man/unicode_u_ucs4_native.3 man/unicode_uc.3 man/unicode_wb_end.3 man/unicode_wb_init.3 man/unicode_wb_next.3 man/unicode_wb_next_cnt.3 man/unicode_wbscan_end.3 man/unicode_wbscan_init.3 man/unicode_wbscan_next.3
+man_MANS=$(srcdir)/man/courier-unicode.7 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]convert.3 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]convert_tocase.3 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]fromu.3 $(srcdir)/man/unicode[\:][\:]iconvert[\:][\:]tou.3 $(srcdir)/man/unicode[\:][\:]linebreak_callback_base.3 $(srcdir)/man/unicode[\:][\:]linebreak_callback_save_buf.3 $(srcdir)/man/unicode[\:][\:]linebreak_iter.3 $(srcdir)/man/unicode[\:][\:]linebreakc_callback_base.3 $(srcdir)/man/unicode[\:][\:]linebreakc_iter.3 $(srcdir)/man/unicode[\:][\:]wordbreak_callback_base.3 $(srcdir)/man/unicode_convert.3 $(srcdir)/man/unicode_convert_deinit.3 $(srcdir)/man/unicode_convert_fromu_init.3 $(srcdir)/man/unicode_convert_fromu_tobuf.3 $(srcdir)/man/unicode_convert_fromutf8.3 $(srcdir)/man/unicode_convert_init.3 $(srcdir)/man/unicode_convert_tobuf.3 $(srcdir)/man/unicode_convert_tocase.3 $(srcdir)/man/unicode_convert_tocbuf_fromutf8_init.3 $(srcdir)/man/unicode_convert_tocbuf_init.3 $(srcdir)/man/unicode_convert_tocbuf_toutf8_init.3 $(srcdir)/man/unicode_convert_tou_init.3 $(srcdir)/man/unicode_convert_tou_tobuf.3 $(srcdir)/man/unicode_convert_toutf8.3 $(srcdir)/man/unicode_convert_uc.3 $(srcdir)/man/unicode_default_chset.3 $(srcdir)/man/unicode_grapheme_break.3 $(srcdir)/man/unicode_html40ent_lookup.3 $(srcdir)/man/unicode_isspace.3 $(srcdir)/man/unicode_lb_end.3 $(srcdir)/man/unicode_lb_init.3 $(srcdir)/man/unicode_lb_next.3 $(srcdir)/man/unicode_lb_next_cnt.3 $(srcdir)/man/unicode_lb_set_opts.3 $(srcdir)/man/unicode_lbc_end.3 $(srcdir)/man/unicode_lbc_init.3 $(srcdir)/man/unicode_lbc_next.3 $(srcdir)/man/unicode_lbc_next_cnt.3 $(srcdir)/man/unicode_lbc_set_opts.3 $(srcdir)/man/unicode_lc.3 $(srcdir)/man/unicode_tc.3 $(srcdir)/man/unicode_u_ucs2_native.3 $(srcdir)/man/unicode_u_ucs4_native.3 $(srcdir)/man/unicode_uc.3 $(srcdir)/man/unicode_wb_end.3 $(srcdir)/man/unicode_wb_init.3 $(srcdir)/man/unicode_wb_next.3 $(srcdir)/man/unicode_wb_next_cnt.3 $(srcdir)/man/unicode_wbscan_end.3 $(srcdir)/man/unicode_wbscan_init.3 $(srcdir)/man/unicode_wbscan_next.3
 
 libunicode_la_SOURCES=unicode.h unicode.c unicodebuf.c \
 			unicodecpp.C \
@@ -193,7 +193,7 @@ docs:
 	rm -f man/*.[123456789]
 	mv man.tmp/* man
 	rm -rf html.tmp man.tmp
-	perl -p -i -e 's/:/[\\:]/g if s@^man_MANS=.*@"man_MANS=" . join(" ", glob("man/*.[123456789]"))@e' Makefile.am
+	perl -p -i -e 's/:/[\\:]/g if s@^man_MANS=.*@"man_MANS=" . join(" ", map { "\$$(srcdir)/$$_" } glob("man/*.[123456789]"))@e' Makefile.am
 
 if HAVE_DOCS
 all-am: INSTALL README
@@ -244,3 +244,12 @@ bump.rpm.release: $(PACKAGE).spec
 	sed 's/^Release: .*/Release: '$$RELEASE'%{?dist}%{?courier_release}/' \
 		<$(PACKAGE).spec >$(PACKAGE).spec.new; \
 	mv $(PACKAGE).spec.new $(PACKAGE).spec
+
+upload-dist:
+	test -z "$(SFPASSWD)" && exit 1; exit 0
+	rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
+	set -e; v="@PACKAGE@/@VERSION@/`date +%Y%m%d%H%M%S`"; git tag -s $$v -m 'Tag version @VERSION@'; cd libs; git tag -s $$v -m 'Tag version @VERSION@'
+	socksify ~/src/sftools/release.pl mrsam $(SFPASSWD) courier courier @VERSION@ @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
+
+www:
+	rsync -a html/. $$HOME/www/www.courier-mta.org/unicode
diff --git a/unicode/courier-unicode.spec.in b/unicode/courier-unicode.spec.in
index e048a3b..bbec1e7 100644
--- a/unicode/courier-unicode.spec.in
+++ b/unicode/courier-unicode.spec.in
@@ -2,7 +2,7 @@ Summary: Courier Unicode Library
 Name: courier-unicode
 Version: @VERSION@
 Release: 1%{?dist}%{?courier_release}
-License: GPL3
+License: GPLv3
 Group: System Environment/Libraries
 URL: http://www.courier-mta.org/unicode/
 Source: http://download.sourceforge.net/courier/courier-unicode-@VERSION@.tar.bz2
@@ -17,8 +17,8 @@ Requires: %{name} = 0:%{version}-%{release}
 This library implements several algorithms related to the Unicode
 Standard.
 
-This package installs only the runtime libraries needed by applications that
-use this library. Install the courier-unicode-devel package if you want
+This package installs only the run-time libraries needed by applications that
+use this library. Install the "courier-unicode-devel" package if you want
 to develop new applications using this library.
 
 %description devel
@@ -56,6 +56,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
-* Sun Jan 12 2014 Sam Varshavchik <mrsam@octopus.email-scan.com>
+* Sun Jan 12 2014 Sam Varshavchik <mrsam@octopus.email-scan.com> - 1.0
 - Initial build.