rpms/opengrok/devel opengrok-0.7-nocplib.patch, NONE, 1.1 opengrok-README.Fedora.nowebapp, NONE, 1.1 opengrok-README.Fedora.webapp, NONE, 1.1 .cvsignore, 1.4, 1.5 opengrok.spec, 1.4, 1.5 sources, 1.4, 1.5 README.Fedora, 1.2, NONE opengrok-0.5-nocplib.patch, 1.1, NONE opengrok.desktop, 1.1, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Oct 16 16:55:59 UTC 2008
- Previous message (by thread): rpms/gnome-lirc-properties/devel glp-dont-use-fluendo-remotes.patch, NONE, 1.1 gnome-lirc-properties.spec, 1.5, 1.6
- Next message (by thread): rpms/jhead/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 jhead-makefile.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/opengrok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20416
Modified Files:
.cvsignore opengrok.spec sources
Added Files:
opengrok-0.7-nocplib.patch opengrok-README.Fedora.nowebapp
opengrok-README.Fedora.webapp
Removed Files:
README.Fedora opengrok-0.5-nocplib.patch opengrok.desktop
Log Message:
* Thu Oct 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.7-0.1-20081016hg
- Update to post-0.7rc1
- Disable JUnit tests
- Remove GUI
opengrok-0.7-nocplib.patch:
--- NEW FILE opengrok-0.7-nocplib.patch ---
During our build we remove everything from lib,
so don't attempt to copy it.
Lubomir Rintel <lkundrak at v3.sk>
--- opengrok-0.7-src/build.xml.nocplib 2008-10-16 17:32:18.000000000 +0200
+++ opengrok-0.7-src/build.xml 2008-10-16 17:35:29.000000000 +0200
@@ -259,7 +259,7 @@
<fileset dir="web"/>
<fileset dir="conf" excludes="web.xml"/>
<lib dir="${dist.dir}" includes="opengrok.jar"/>
- <lib dir="${dist.dir}/lib" includes="*.jar" excludes="servlet-api.jar"/>
+ <!-- <lib dir="${dist.dir}/lib" includes="*.jar" excludes="servlet-api.jar"/> -->
</war>
<echo message="Generating man page.."/>
<java classname="org.opensolaris.opengrok.index.CommandLineOptions"
--- NEW FILE opengrok-README.Fedora.nowebapp ---
Note:
-----
This version of OpenGrok RPM package does not contain the Web application,
as the Java Web Application Guidelines [1] are not yet finished.
[1] https://fedoraproject.org/wiki/PackagingDrafts/JavaWebApps
You are encouraged to help finish them! In meanwhile you can generate
the Web application package by recompiling the source package passing
"--with webapp" argument to rpmbuild.
---------------------------------------------------------------------------
This text was written by Lubomir Rintel <lkundrak at v3.sk>
Should you find a problem in it, report at https://bugzilla.redhat.com/
***** Error reading new file: [Errno 2] No such file or directory: 'opengrok-README.Fedora.webapp'
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 10 Aug 2008 08:46:09 -0000 1.4
+++ .cvsignore 16 Oct 2008 16:55:28 -0000 1.5
@@ -1 +1 @@
-opengrok-r358-src.tar.gz
+opengrok-r617-src.tar.gz
Index: opengrok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/opengrok.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opengrok.spec 10 Aug 2008 08:46:09 -0000 1.4
+++ opengrok.spec 16 Oct 2008 16:55:29 -0000 1.5
@@ -1,23 +1,31 @@
%define _default_patch_fuzz 2
+# Webapp is disabled, since Fedora does not have the Java Webapp guidelines
+# finished yet
+%if %{?fedora}0
+%define webapp %{?_with_webapp:1} %{!?_with_webapp:0}
+%else
+%define webapp %{?!_without_webapp:1} %{?_without_webapp:0}
+%endif
+
Name: opengrok
-Version: 0.6.1
-Release: 3.20080810hg%{?dist}
+Version: 0.7
+Release: 0.1.20081016hg%{?dist}
Summary: Source browser and indexer
Group: Development/Tools
License: CDDL
URL: http://www.opensolaris.org/os/project/opengrok/
#Source0: http://www.opensolaris.org/os/project/opengrok/files/%{name}-%{version}-src.tar.gz
-# hg clone -r358 ssh://anon@hg.opensolaris.org/hg/opengrok/trunk opengrok-0.6.1-src
-# tar czf opengrok-r358-src.tar.gz --exclude .hg opengrok-0.6.1-src
-Source0: opengrok-r358-src.tar.gz
+# hg clone -r617 ssh://anon@hg.opensolaris.org/hg/opengrok/trunk opengrok-0.7-src
+# tar czf opengrok-r617-src.tar.gz --exclude .hg opengrok-0.7-src
+Source0: opengrok-r617-src.tar.gz
Source1: opengrok
Source2: configuration.xml
-Source3: opengrok.desktop
-Source4: README.Fedora
+Source3: opengrok-README.Fedora.webapp
+Source4: opengrok-README.Fedora.nowebapp
Patch0: opengrok-0.5-jrcs-import.patch
-Patch1: opengrok-0.5-nocplib.patch
+Patch1: opengrok-0.7-nocplib.patch
Patch3: opengrok-0.5-manifest-classpath.patch
Patch4: opengrok-0.6-nooverview.patch
Patch5: opengrok-0.6-nochangeset.patch
@@ -36,7 +44,6 @@
# This is just to prevent GCJ from attempting to build this.
# ant scripts from both jrcs and opengrok need to be fixed somehow
BuildRequires: java-devel >= 1.6
-BuildRequires: desktop-file-utils
BuildRequires: subversion-javahl
BuildRequires: unzip
BuildRequires: junit4
@@ -60,6 +67,17 @@
%{summary}.
+%if %{webapp}
+%package tomcat5
+Summary: Source browser web application
+Group: Development/Tools
+Requires: %{name} tomcat5
+
+%description tomcat5
+OpenGrok web application
+%endif
+
+
%prep
%setup -q -n %{name}-%{version}-src
%{__unzip} -q ext/jrcs.zip
@@ -85,7 +103,11 @@
-i conf/web.xml
# README.Fedora
-cp %{SOURCE4} .
+%if %{webapp}
+cp %{SOURCE3} README.Fedora
+%else
+cp %{SOURCE4} README.Fedora
+%endif
%build
@@ -120,13 +142,19 @@
CLASSPATH=$(build-classpath junit4) %{ant} test
popd
-CLASSPATH=$(build-classpath jflex junit4) %{ant} test
+#CLASSPATH=$(build-classpath jflex junit4) %{ant} test
%install
rm -rf $RPM_BUILD_ROOT
# directories
+
+%if %{webapp}
+%define webappdir %{_localstatedir}/lib/tomcat5/webapps/source
+install -d $RPM_BUILD_ROOT%{webappdir}/WEB-INF/lib
+%endif
+
install -d $RPM_BUILD_ROOT%{_javadir}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jrcs
@@ -167,11 +195,20 @@
# Configuration file configuration.xml
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-# Menu entry
-install conf/default/img/icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/opengrok.png
-desktop-file-install --vendor=fedora \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- %{SOURCE3}
+%if %{webapp}
+# Make love, not war!
+unzip -q dist/source.war -d $RPM_BUILD_ROOT%{webappdir}
+(IFS=:; for file in $(build-classpath \
+ bcel jakarta-oro swing-layout \
+ lucene lucene-contrib/lucene-spellchecker) \
+ $(build-classpath svn-javahl.jar || echo %{_libdir}/svn-javahl/svn-javahl.jar) \
+ %{_javadir}/opengrok.jar \
+ %{_javadir}/opengrok-jrcs/org.apache.commons.jrcs.diff.jar \
+ %{_javadir}/opengrok-jrcs/org.apache.commons.jrcs.rcs.jar
+do
+ ln -sf $file $RPM_BUILD_ROOT%{webappdir}/WEB-INF/lib
+done)
+%endif
%clean
@@ -184,18 +221,31 @@
%{_bindir}/opengrok
%{_mandir}/man1/opengrok.1*
%{_localstatedir}/lib/%{name}
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/opengrok.png
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/configuration.xml
%doc CHANGES.txt LICENSE.txt README.txt doc/EXAMPLE.txt README.Fedora
%files javadoc
+%defattr(-,root,root,-)
%{_javadocdir}/*
+%if %{webapp}
+%files tomcat5
+%defattr(-,root,root,-)
+%{webappdir}
+%config(noreplace) %{webappdir}/WEB-INF/web.xml
+%config(noreplace) %{webappdir}/index_body.html
+%endif
+
+
%changelog
+* Thu Oct 16 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.7-0.1-20081016hg
+- Update to post-0.7rc1
+- Disable JUnit tests
+- Remove GUI
+
* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.6.1-3.20080810hg
- Update to a Mercurial snapshot to adress excessive memory usage bug
- Specify fuzz for patches explicitely for now (see #458577)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opengrok/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Aug 2008 08:46:09 -0000 1.4
+++ sources 16 Oct 2008 16:55:29 -0000 1.5
@@ -1 +1 @@
-14c497f78c12072ff5b40d059449b5ed opengrok-r358-src.tar.gz
+98b6dd34a7f3645a64e04f0f8ad17f31 opengrok-r617-src.tar.gz
--- README.Fedora DELETED ---
--- opengrok-0.5-nocplib.patch DELETED ---
--- opengrok.desktop DELETED ---
- Previous message (by thread): rpms/gnome-lirc-properties/devel glp-dont-use-fluendo-remotes.patch, NONE, 1.1 gnome-lirc-properties.spec, 1.5, 1.6
- Next message (by thread): rpms/jhead/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 jhead-makefile.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list