rpms/cvsgraph/devel .cvsignore, 1.3, 1.4 cvsgraph-config.patch, 1.1, 1.2 cvsgraph.spec, 1.5, 1.6 sources, 1.3, 1.4 cvsgraph-spelling.patch, 1.1, NONE cvsgraph-wrapper.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/cvsgraph/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18386

Modified Files:
	.cvsignore cvsgraph-config.patch cvsgraph.spec sources 
Removed Files:
	cvsgraph-spelling.patch cvsgraph-wrapper.patch 
Log Message:
Update to 1.5.1, drop -web.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:11:43 -0000	1.3
+++ .cvsignore	26 Jan 2005 20:08:42 -0000	1.4
@@ -1 +1 @@
-cvsgraph-1.5.0.tar.gz
+cvsgraph-1.5.1.tar.gz

cvsgraph-config.patch:

Index: cvsgraph-config.patch
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvsgraph-config.patch	8 Nov 2004 04:11:43 -0000	1.1
+++ cvsgraph-config.patch	26 Jan 2005 20:08:42 -0000	1.2
@@ -42,14 +42,3 @@
 -title_ttfont	= "/dos/windows/fonts/times.ttf";
 +title_ttfont	= "/usr/share/fonts/bitstream-vera/VeraSe.ttf";
  title_ttsize	= 10.0;
-@@ -339,7 +339,7 @@
- map_branch_alt	= "alt=\"%0 %(%t%) (%B)\"";
--map_rev_href	= "href=\"%9cvsweb_graph.cgi/%m%p%F?rev=%R&content-type=text/x-cvsweb-markup%8\"";
-+map_rev_href	= "href=\"%9cvsweb_graph.cgi/%m%p%F?rev=%R&content-type=text/x-cvsweb-markup%8\"";
- map_rev_alt	= "alt=\"%1 %(%t%) (%R)\"";
--map_diff_href	= "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\"";
-+map_diff_href	= "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\"";
- map_diff_alt	= "alt=\"%2 %P <-> %R\"";
--map_merge_href	= "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\"";
-+map_merge_href	= "href=\"%9cvsweb_graph.cgi/%m%p%F.diff?r1=%P&r2=%R%8\"";
- map_merge_alt	= "alt=\"%2 %P <-> %R\"";


Index: cvsgraph.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/cvsgraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cvsgraph.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ cvsgraph.spec	26 Jan 2005 20:08:42 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           cvsgraph
-Version:        1.5.0
+Version:        1.5.1
 Release:        1
 Epoch:          0
 Summary:        A CVS/RCS repository grapher
@@ -7,44 +7,31 @@
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.akhphd.au.dk/~bertho/cvsgraph/
-Source0: http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.5.0.tar.gz
+Source0: http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.5.1.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-config.patch
-Patch1:         %{name}-wrapper.patch
-Patch2:         %{name}-spelling.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel, byacc, flex, freetype-devel, libpng-devel, zlib-devel
 BuildRequires:  libjpeg-devel, %{__perl}
+Obsoletes:      cvsgraph-web < 0:1.5.1
 
 %description
 CvsGraph is a utility to make a graphical representation of all
 revisions and branches of a file in a CVS/RCS repository. It has been
 inspired by the 'graph' option in WinCVS.
 
-%package        web
-Summary:        WWW interface to %{name}
-Group:          Development/Tools
-Requires:       %{name} = %{epoch}:%{version}-%{release}, httpd, php
-
-%description    web
-WWW interface to %{name}.
-
 
 %prep
 %setup -q
 %patch0
-%patch1
-%patch2 -p1
-# Fix up paths in php files
-rename .php3 .php *.php3
+rename .php3 .php contrib/*.php3
 %{__perl} -pi -e \
   's|/home/bertho/public_html/cvsgraph/cvsgraph|%{_bindir}/cvsgraph|g ;
-   s|/home/bertho/public_html/cvsgraph/conf/cvsgraph\.conf|%{_sysconfdir}/cvsgraph.conf|g ;
-   s|\b1\.1\.2\b|%{version}|g' \
-   *.php
-# Fix man page path
+   s|/home/bertho/public_html/cvsgraph/conf/cvsgraph\.conf|%{_sysconfdir}/cvsgraph.conf|g' \
+   contrib/*.php
 %{__perl} -pi -e 's|/usr/local/etc|%{_sysconfdir}|g' cvsgraph.1
+cp -p %{SOURCE1} contrib/cvsgraph-httpd.conf
 
 
 %build
@@ -54,46 +41,29 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -Dpm 755 cvsgraph $RPM_BUILD_ROOT%{_bindir}/cvsgraph
 install -Dpm 644 cvsgraph.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsgraph.conf
 install -Dpm 644 cvsgraph.1 $RPM_BUILD_ROOT%{_mandir}/man1/cvsgraph.1
 install -Dpm 644 cvsgraph.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/cvsgraph.conf.5
 
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/web
-install -pm 644 *.php $RPM_BUILD_ROOT%{_datadir}/%{name}/web
-
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-%{__perl} -pe 's|/usr/share/cvsgraph/web\b|%{_datadir}/%{name}/web|' \
-  %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post web
-[ $1 -eq 1 ] && %{_initrddir}/httpd reload >/dev/null || :
-
-%postun web
-%{_initrddir}/httpd reload >/dev/null || :
-
-
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE README
+%doc ChangeLog LICENSE README contrib/
 %config(noreplace) %{_sysconfdir}/cvsgraph.conf
 %{_bindir}/cvsgraph
 %{_mandir}/man[15]/cvsgraph*.[15]*
 
-%files web
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/zzz-%{name}.conf
-%{_datadir}/%{name}
-
 
 %changelog
+* Wed Jan 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.1-1
+- Update to 1.5.1; wrapper, spelling and part of config patch applied upstream.
+- Drop -web subpackage, include *.php as docs.
+
 * Fri Sep  3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.0-0.fdr.1
 - Update to 1.5.0.
 - Improve default configuration, manual page spelling fixes.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsgraph/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:11:43 -0000	1.3
+++ sources	26 Jan 2005 20:08:42 -0000	1.4
@@ -1 +1 @@
-4b3e7d0ac09222407c1357bb348869a2  cvsgraph-1.5.0.tar.gz
+2f01dc06685581ac03bac38e08bf3b29  cvsgraph-1.5.1.tar.gz


--- cvsgraph-spelling.patch DELETED ---


--- cvsgraph-wrapper.patch DELETED ---