rpms/w3m/devel w3m-0.5.1-mkdir_p.patch,NONE,1.1 w3m.spec,1.35,1.36

[fedora-cvs-commits at redhat.com]

Author: pnemade

Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6768

Modified Files:
	w3m.spec 
Added Files:
	w3m-0.5.1-mkdir_p.patch 
Log Message:
- Modified SPEC file to add new patchfile to resolve rh#222914.



w3m-0.5.1-mkdir_p.patch:
 Makefile.in.in |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

--- NEW FILE w3m-0.5.1-mkdir_p.patch ---
--- w3m-0.5.1/po/Makefile.in.in	2003-09-24 00:12:25.000000000 +0530
+++ w3m-0.5.1/po/Makefile.in.in.mkdir_p	2007-02-21 11:14:16.000000000 +0530
@@ -26,8 +26,18 @@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @MKDIR_P@
 
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
@@ -137,7 +147,7 @@
 install-exec:
 install-data: install-data- at USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -150,13 +160,13 @@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -196,19 +206,19 @@
 installdirs-exec:
 installdirs-data: installdirs-data- at USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -343,8 +353,7 @@
 
 Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
 
 force:



Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- w3m.spec	2 Feb 2007 07:53:12 -0000	1.35
+++ w3m.spec	21 Feb 2007 09:31:37 -0000	1.36
@@ -4,7 +4,7 @@
 
 Name:     w3m
 Version:  0.5.1
-Release:  15.1%{?dist}
+Release:  16%{?dist}
 License:  BSD
 URL:      http://w3m.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@
 
 ## fix patch
 Patch15:  w3m-0.4.1-helpcharset.patch
+Patch16:  w3m-0.5.1-mkdir_p.patch
 Patch17:  w3m-0.5-static-libgc.patch
 Patch21:  w3m-0.5.1-gcc4.patch
 Patch22:  w3m-cvs-20050328.patch
@@ -71,6 +72,7 @@
 chmod 755 %{_builddir}/w3m-0.5.1/doc-jp
 
 %patch15 -p1
+%patch16 -p1
 %patch17 -p1
 %patch21 -p1
 %patch22 -p0
@@ -125,7 +127,6 @@
 %defattr(-, root, root, -)
 %doc doc doc-jp
 ## %doc README.img
-%attr(0755, root, root) %{_libexecdir}/w3m
 %{_datadir}/w3m
 %config(noreplace) %{_sysconfdir}/w3m
 %{_bindir}/w3m*
@@ -139,6 +140,9 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Wed Feb 21 2007 Parag Nemade <pnemade at redhat.com> - 0.5.1-16
+- Modified SPEC file to add new patchfile to resolve rh#222914.
+
 * Fri Feb 02 2007 Parag Nemade <pnemade at redhat.com> - 0.5.1-15.1
 - Resolves: rh#226535 Review Merge 
 - Modified SPEC file.