OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-May-2006 12:10:58
Branch: HEAD Handle: 2006052511105701
Modified files:
openpkg-src/viewvc viewvc.spec
Removed files:
openpkg-src/viewvc viewvc.patch
Log:
upgrading package: viewvc 0.9.4 -> 1.0.0
Summary:
Revision Changes Path
1.3 +0 -41 openpkg-src/viewvc/viewvc.patch
1.4 +16 -18 openpkg-src/viewvc/viewvc.spec
____________________________________________________________________________
rm -f openpkg-src/viewvc/viewvc.patch <<'@@ .'
Index: openpkg-src/viewvc/viewvc.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/viewvc/viewvc.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 viewvc.spec
--- openpkg-src/viewvc/viewvc.spec 7 Feb 2006 07:50:58 -0000 1.3
+++ openpkg-src/viewvc/viewvc.spec 25 May 2006 10:10:58 -0000 1.4
@@ -23,8 +23,9 @@
##
# package version
-%define V_dist 0.9.4
-%define V_subdir 3330/27671
+%define V_opkg 1.0.0
+%define V_dist 1.0.0
+%define V_subdir 3330/31766
# package information
Name: viewvc
@@ -36,15 +37,14 @@
Class: EVAL
Group: Web
License: BSD
-Version: %{V_dist}
-Release: 20060207
+Version: %{V_opkg}
+Release: 20060525
# package options
%option with_cvsgraph no
# list of sources
-Source0:
http://viewvc.tigris.org/files/documents/%{V_subdir}/viewcvs-%{V_dist}.tar.gz
-Patch0: viewvc.patch
+Source0:
http://viewvc.tigris.org/files/documents/%{V_subdir}/viewvc-%{V_dist}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -79,43 +79,41 @@
}
%prep
- %setup -q -n viewcvs-%{V_dist}
- %patch -p0
+ %setup -q
%build
%{l_shtool} subst \
- -e "s;@RPM_BUILD_ROOT@;$RPM_BUILD_ROOT;" \
- viewcvs-install
- %{l_shtool} subst \
-e "s;^use_enscript =.*;use_enscript = 1;" \
-e "s;^enscript_path =.*;enscript_path = %{l_prefix}/bin/;" \
- cgi/viewcvs.conf.dist
+ viewvc.conf.dist
%if "%{with_cvsgraph}" == "yes"
%{l_shtool} subst \
-e "s;^use_cvsgraph =.*;use_cvsgraph = 1;" \
-e "s;^cvsgraph_path =.*;cvsgraph_path = %{l_prefix}/bin/;" \
- cgi/viewcvs.conf.dist
+ viewvc.conf.dist
%endif
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/viewvc
- echo "%{l_prefix}/share/viewvc" | ./viewcvs-install
+ ( echo "%{l_prefix}/share/viewvc"
+ echo "$RPM_BUILD_ROOT"
+ ) | ./viewvc-install
for py in $RPM_BUILD_ROOT%{l_prefix}/share/viewvc/lib/*.py; do
%{l_shtool} subst -q \
- -e
's;%{l_prefix}/share/viewvc/viewcvs\.conf;%{l_prefix}/etc/viewvc/viewcvs.conf;g'
\
+ -e
's;%{l_prefix}/share/viewvc/viewvc\.conf;%{l_prefix}/etc/viewvc/viewvc.conf;g' \
-e
's;%{l_prefix}/share/viewvc/cvsgraph\.conf;%{l_prefix}/etc/viewvc/cvsgraph.conf;g'
\
$py
eval "%{l_prefix}/bin/python -c 'import py_compile;
py_compile.compile(\"$py\")'"
done
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/viewvc
- mv $RPM_BUILD_ROOT%{l_prefix}/share/viewvc/viewcvs.conf \
- $RPM_BUILD_ROOT%{l_prefix}/etc/viewvc/viewcvs.conf
+ mv $RPM_BUILD_ROOT%{l_prefix}/share/viewvc/viewvc.conf \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/viewvc/viewvc.conf
mv $RPM_BUILD_ROOT%{l_prefix}/share/viewvc/cvsgraph.conf \
$RPM_BUILD_ROOT%{l_prefix}/etc/viewvc/cvsgraph.conf
- mv $RPM_BUILD_ROOT%{l_prefix}/share/viewvc/cgi \
+ mv $RPM_BUILD_ROOT%{l_prefix}/share/viewvc/bin/cgi \
$RPM_BUILD_ROOT%{l_prefix}/cgi
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
