rpms/aspell/devel aspell-0.60.3-pspell_conf.patch, NONE, 1.1 aspell.spec, 1.31, 1.32

Wed May 24 08:29:40 UTC 2006

Author: varekova

Update of /cvs/dist/rpms/aspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25987

Modified Files:
	aspell.spec 
Added Files:
	aspell-0.60.3-pspell_conf.patch 
Log Message:
- fix multilib problem (used pkgconfig)


aspell-0.60.3-pspell_conf.patch:
 Makefile.in      |    4 +++-
 aspell.pc.in     |   12 ++++++++++++
 configure        |    3 ++-
 scripts/mkconfig |    2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

--- NEW FILE aspell-0.60.3-pspell_conf.patch ---
--- aspell-0.60.3/configure.pom	2006-05-23 16:21:04.000000000 +0200
+++ aspell-0.60.3/configure	2006-05-23 16:21:04.000000000 +0200
@@ -23622,7 +23622,7 @@
 #                                                                 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile m4/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in modules/filter/Makefile myspell/Makefile lib5/Makefile"
+                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile m4/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in modules/filter/Makefile myspell/Makefile lib5/Makefile aspell.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24239,6 +24239,7 @@
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "gen/settings.h" ) CONFIG_HEADERS="$CONFIG_HEADERS gen/settings.h" ;;
+  "aspell.pc" ) CONFIG_FILES="$CONFIG_FILES aspell.pc" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
--- aspell-0.60.3/Makefile.in.pom	2006-05-23 16:21:04.000000000 +0200
+++ aspell-0.60.3/Makefile.in	2006-05-23 16:24:09.000000000 +0200
@@ -783,6 +783,8 @@
 	done
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
+	mkdir -p $(libdir)/pkgconfig; \
+	cp aspell.pc $(libdir)/pkgconfig/aspell.pc; \
 	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
@@ -790,7 +792,7 @@
 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
-	done
+	done 
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
--- aspell-0.60.3/scripts/mkconfig.pom	2004-01-03 13:06:24.000000000 +0100
+++ aspell-0.60.3/scripts/mkconfig	2006-05-23 16:21:04.000000000 +0200
@@ -15,7 +15,7 @@
   echo "$2"
   ;;
 --pkgdatadir | pkgdatadir)
-  echo "$3"
+  pkg-config aspell --variable=pkgdatadir
   ;;
 *)
   echo "usage: pspell-config version|datadir|pkgdatadir"
--- /dev/null	2006-05-22 08:57:38.164651760 +0200
+++ aspell-0.60.3/aspell.pc.in	2006-05-23 16:21:04.000000000 +0200
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkgdatadir=@pkgdatadir@
+
+Name: Aspell
+Description: A spelling checker.
+Version: @VERSION@
+Requires: 
+Libs: -L${libdir} -laspell
+Cflags: -I${includedir}


Index: aspell.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- aspell.spec	22 Mar 2006 14:25:31 -0000	1.31
+++ aspell.spec	24 May 2006 08:29:37 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A spelling checker.
 Name: aspell
 Version: 0.60.3
-Release: 6
+Release: 7
 Epoch: 12
 License: LGPL
 Group: Applications/Text
@@ -13,9 +13,10 @@
 Patch4: aspell-0.60.3-gcc41.patch
 Patch5: aspell-0.60.3-fileconflict.patch
 Patch6: aspell-0.60.3-man_page.patch
+Patch7: aspell-0.60.3-pspell_conf.patch
 Requires: aspell-en
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gettext, ncurses-devel
+BuildRequires: gettext, ncurses-devel, pkgconfig
 Prereq: /sbin/install-info
 Provides: pspell
 Obsoletes: ispell, pspell, aspell-de < 0.50, aspell-fr < 0.50, aspell-ca < 0.50, aspell-da < 0.50, aspell-es < 0.50, aspell-it < 0.50, aspell-nl < 0.50, aspell-no < 0.50, aspell-sv < 0.50, aspell-pt_BR, aspell-config
@@ -50,6 +51,7 @@
 %patch4 -p1 -b .gcc41
 %patch5 -p1 -b .fc
 %patch6 -p1 -b .stacc
+%patch7 -p1 -b .mlib
 
 %build
 %configure
@@ -120,10 +122,14 @@
 %{_includedir}/aspell.h
 %{_includedir}/pspell/pspell.h
 %{_libdir}/lib*spell.so
+%{_libdir}/pkgconfig/*
 %{_infodir}/aspell-dev.*
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Tue May 23 2006 Ivana Varekova <varekova at redhat.com> - 12:0.60.3-7
+- fix multilib problem (used pkgconfig)
+
 * Wed Mar 22 2006 Ivana Varekova <varekova at redhat.com> - 12:0.60.3-6
 - remove .la files (bug 184184)
 


