[yap] Install http module CSS files into correct place
Petr Pisar
ppisar at fedoraproject.org
Tue Jan 4 10:45:24 UTC 2011
commit b6860f6edea8e838a2f4a67c7ad20ad54e4bde61
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Dec 21 13:02:57 2010 +0100
Install http module CSS files into correct place
....2.0-Install-http-CSS-files-into-PLTARGET.patch | 30 ++++++++++++++++++++
yap.spec | 6 ++-
2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch b/yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch
new file mode 100644
index 0000000..6b3f949
--- /dev/null
+++ b/yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch
@@ -0,0 +1,30 @@
+From 1ea44f8db749d81a790c55d63bfa4c1dbd5cb211 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 21 Dec 2010 12:59:55 +0100
+Subject: [PATCH] Install http CSS files into PLTARGET
+
+---
+ packages/http/Makefile.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in
+index 8609697..1c3dbda 100755
+--- a/packages/http/Makefile.in
++++ b/packages/http/Makefile.in
+@@ -111,11 +111,11 @@ install: $(LIBPL) $(SOLIBS)
+ $(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET)
+ mkdir -p $(PLTARGET)
+ mkdir -p $(PLTARGET)/web/icons
+- mkdir -p $(DESTDIR)$(LIBDIR)/web/css
++ mkdir -p $(PLTARGET)/web/css
+ $(INSTALL_DATA) $(LIBPL) $(PLTARGET)
+ $(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
+ $(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons
+- $(INSTALL_DATA) $(srcdir)/web/css/*.css $(DESTDIR)$(LIBDIR)/web/css
++ $(INSTALL_DATA) $(srcdir)/web/css/*.css $(PLTARGET)/web/css
+ $(PL) -f none -g make -t halt
+
+ ln-install: $(LIBPL)
+--
+1.7.3.4
+
diff --git a/yap.spec b/yap.spec
index 3f6670b..20e3f63 100644
--- a/yap.spec
+++ b/yap.spec
@@ -13,6 +13,7 @@ Source4: chr_translate.pl
Patch1: Yap-noni386.patch
Patch2: yap-6.2.0-Locate-mysql-by-mysql_config.patch
Patch3: yap-6.2.0-Install-directory-for-info-pages.patch
+Patch4: yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, gmp-devel, texinfo
BuildRequires: autoconf
@@ -51,8 +52,8 @@ Documentation for Yap.
%patch1 -p1
%patch2 -p1 -b .mysql_config
%patch3 -p1 -b .install_info_directory
-# Regerenate configure because of yap-6.2.0-Locate-mysql-by-mysql_config.patch
-# and yap-6.2.0-Install-directory-for-info-pages.patch
+%patch4 -p1 -b .install_css_into_pltarget
+# Regerenate configure because of patching
autoconf
find -name CVS -print0 | xargs -0 rm -rf
@@ -177,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
- Locate mysql by mysql_config
- Fix info pages installation
- Logtalk is no logner distributed with yap
+- Install http module CSS files to correct place
* Wed Dec 08 2010 Petr Pisar <ppisar at redhat.com> - 5.1.3-3
- Hack SWI-compatible libraries build system to be compilable (bug #660965)
More information about the scm-commits
mailing list