packages: v8cgi/v8cgi.spec - gcc epoch - %config attrs for config - snapsho...
glen
glen at pld-linux.org
Wed Mar 10 17:44:50 CET 2010
Author: glen Date: Wed Mar 10 16:44:50 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- gcc epoch
- %config attrs for config
- snapshot create hints, and include tarball
- quote CC/CXX
---- Files affected:
packages/v8cgi:
v8cgi.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/v8cgi/v8cgi.spec
diff -u packages/v8cgi/v8cgi.spec:1.3 packages/v8cgi/v8cgi.spec:1.4
--- packages/v8cgi/v8cgi.spec:1.3 Wed Mar 10 07:21:58 2010
+++ packages/v8cgi/v8cgi.spec Wed Mar 10 17:44:45 2010
@@ -1,21 +1,24 @@
# $Revision$, $Date$
-
-%define snap 20100309svn785
+# TODO:
+# - scons: *** Path for option v8_path does not exist: ../v8
+%define svnrev 785
%define rel 1
Summary: JavaScript Engine
Name: v8cgi
Version: 0.8.1
-Release: 0.%{snap}.%{rel}
+Release: 0.%{svnrev}.%{rel}
License: BSD
Group: Libraries
URL: http://code.google.com/p/v8cgi
-# No tarballs, pulled from svn
-# svn export http://v8cgi.googlecode.com/svn/trunk/ v8cgi
-Source0: %{name}-%{snap}.tar.bz2
-# Source0-md5: 3f7d283316c8e39ae3abd64b5c09ffd7
+# svn co http://v8cgi.googlecode.com/svn/trunk${revno:+@$revno} v8cgi
+# tar -cjf v8cgi-$(svnversion v8cgi).tar.bz2 --exclude=.svn v8cgi
+# ../dropin v8cgi-$(svnversion v8cgi).tar.bz2 &
+# ../md5 v8cgi
+Source0: %{name}-%{svnrev}.tar.bz2
+# Source0-md5: 5578247aebd00b5c8a08b0c8b5e3459d
Source1: %{name}.conf
BuildRequires: fcgi-devel
-BuildRequires: gcc >= 4.0
+BuildRequires: gcc >= 6:4.0
BuildRequires: libstdc++-devel
BuildRequires: scons
BuildRequires: v8-devel
@@ -32,21 +35,20 @@
%build
# build library
-
CFLAGS="%{rpmcflags}"
CXXFLAGS="%{rpmcxxflags}"
LDFLAGS="%{rpmcflags}"
%if "%{pld_release}" == "ac"
-CC=%{__cc}4
-CXX=%{__cxx}4
+CC="%{__cc}4"
+CXX="%{__cxx}4"
%else
-CC=%{__cc}
-CXX=%{__cxx}
+CC="%{__cc}"
+CXX="%{__cxx}"
%endif
export CFLAGS LDFLAGS CXXFLAGS CC CXX
%scons \
- apache_path=`apxs -q INCLUDEDIR` \
- cpppath=`pkg-config --variable=includedir apr-1`\;`pkg-config --variable=includedir apr-util-1`\;%{_includedir}/fastcgi \
+ apache_path=$(apxs -q INCLUDEDIR) \
+ cpppath="$(pkg-config --variable=includedir apr-1);$(pkg-config --variable=includedir apr-util-1);%{_includedir}/fastcgi" \
sockets=1 \
fcgi=1 \
mysql=1
@@ -55,8 +57,8 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/v8cgi,%{_sysconfdir}}
install -p v8cgi $RPM_BUILD_ROOT%{_bindir}/v8cgi
-install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/v8cgi.conf
-install lib/* $RPM_BUILD_ROOT%{_libdir}/v8cgi/
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/v8cgi.conf
+install -p lib/* $RPM_BUILD_ROOT%{_libdir}/v8cgi
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,7 +66,7 @@
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/v8cgi
-%{_sysconfdir}/v8cgi.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/v8cgi.conf
%dir %{_libdir}/v8cgi
%attr(755,root,root) %{_libdir}/v8cgi/*.so
%{_libdir}/v8cgi/*.js
@@ -75,6 +77,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/03/10 16:44:45 glen
+- gcc epoch
+- %config attrs for config
+- snapshot create hints, and include tarball
+- quote CC/CXX
+
Revision 1.3 2010/03/10 06:21:58 aredridel
- BR: fcgi-devel
- remove xerces module for now
@@ -85,4 +93,3 @@
Revision 1.1 2010/03/10 06:12:30 aredridel
- initial commit
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/v8cgi/v8cgi.spec?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list