SPECS: nvu.spec - added patches: nvu-{systemnspr, 64bit-fixes, brows...
blekot
blekot at pld-linux.org
Thu Jan 26 18:46:54 CET 2006
Author: blekot Date: Thu Jan 26 17:46:54 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added patches: nvu-{systemnspr,64bit-fixes,browser,pld}.patch
- compiles but install needs to be rewriten (install doesn't work in that way)
- still NFY!
---- Files affected:
SPECS:
nvu.spec (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SPECS/nvu.spec
diff -u SPECS/nvu.spec:1.20 SPECS/nvu.spec:1.21
--- SPECS/nvu.spec:1.20 Thu Jan 26 17:32:54 2006
+++ SPECS/nvu.spec Thu Jan 26 18:46:49 2006
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# TODO:
-# - build with system nspr, jpeg, png and maybe more...
+# - %install is broken. Should be rewritten.
#
Summary: Complete Web authoring system for Linux
Summary(pl): Kompletny system do tworzenia stron WWW dla Linuksa
@@ -15,7 +15,10 @@
Patch0: %{name}-domainfix.patch
Patch1: %{name}-freetype2.patch
Patch2: %{name}-nsBrowserInstance.cpp-include.patch
-# Patch agains export MOZ_PHOENIX=1
+Patch3: %{name}-systemnspr.patch
+Patch4: %{name}-64bit-fixes.patch
+Patch5: %{name}-browser.patch
+Patch6: %{name}-pld.patch
URL: http://www.nvu.com/
BuildRequires: GConf2-devel
BuildRequires: freetype-devel >= 2.1.3
@@ -72,7 +75,11 @@
cd mozilla
%patch0 -p0
%patch1 -p1
-
+#patch2 -p1 #export MOZ_PHOENIX=1 broke build
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# let jars get compressed
%{__perl} -pi -e 's|\-0|\-9|g' config/make-jars.pl
@@ -128,8 +135,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C xpinstall/packager \
+ MOZ_PKG_APPNAME="nvu" \
+ EXCLUDE_NSPR_LIBS=1
+
+#%{__make} install \
+# DESTDIR=$RPM_BUILD_ROOT
+# MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \
%clean
rm -rf $RPM_BUILD_ROOT
@@ -180,6 +192,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2006/01/26 17:46:49 blekot
+- added patches: nvu-{systemnspr,64bit-fixes,browser,pld}.patch
+- compiles but install needs to be rewriten (install doesn't work in that way)
+- still NFY!
+
Revision 1.20 2006/01/26 16:32:54 blekot
- few fixes against build
- STBR/test
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/nvu.spec?r1=1.20&r2=1.21&f=u
More information about the pld-cvs-commit
mailing list