rpms/rt3/devel rt3.spec,1.26,1.27

[Ralf Corsépius]

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6451

Modified Files:
	rt3.spec 
Log Message:
* Mon Sep 23 2008 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.1-0
- First try at public release.
- Completely rework the spec.
- Upstream update.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rt3.spec	26 Jun 2008 14:12:49 -0000	1.26
+++ rt3.spec	23 Sep 2008 04:12:51 -0000	1.27
@@ -4,6 +4,33 @@
 # package are under the same license as the package itself.
 #
 
+# Supported rpmbuild options:
+#
+# --with gd/--without gd 
+#	enable/disable gd support
+#	Default: --with (had been default in rt < 3.8.0)
+%bcond_without gd 
+
+# --with graphviz/--without graphviz
+#	enable/disable graphiz support
+#	Default: --without (missing deps)
+%bcond_with graphviz
+
+# --with devel_mode/--without devel_mode
+#	enable/disable building/installing devel files
+#	Default: without (missing deps; TBA in spec)
+%bcond_with devel_mode
+
+# --with gpg/--without gpg
+#	enable/disable building gpg support
+#	Default: without
+%bcond_with gpg
+
+# --with tests
+#	run testsuite when building the rpm
+#	Default: without (doesn't work in chroots.)
+%bcond_with tests
+
 %define RT3_BINDIR		%{_sbindir}
 %define RT3_LIBDIR		%{perl_vendorlib}
 %define RT3_WWWDIR		%{_datadir}/rt3/html
@@ -12,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.7
-Release:	1%{?dist}
+Version:	3.8.1
+Release:	0%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -24,9 +51,10 @@
 Source4:	README.fedora.in
 Source5:	rt3.logrotate.in
 
-Patch0:		rt-3.6.1-config.diff
+Patch0:		rt-3.8.1-config.diff
 Patch1:		rt-3.4.1-I18N.diff
-Patch2:		rt-3.6.0-Makefile.diff
+Patch2:		rt-3.8.1-Makefile.diff
+Patch3:		rt-3.8.1-test-dependencies.diff
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +62,8 @@
 # For Debian compatibility
 Provides:	request-tracker3 = %{version}-%{release}
 
-%if 0%{?_with_testdeps} 
+# This list is alpha sorted
+BuildRequires: perl(Apache::DBI)
 BuildRequires: perl(Apache::Session) >= 1.53
 BuildRequires: perl(Cache::Simple::TimedExpiry)
 BuildRequires: perl(Calendar::Simple)
@@ -42,44 +71,71 @@
 BuildRequires: perl(Class::ReturnValue) >= 0.40
 BuildRequires: perl(CPAN)
 BuildRequires: perl(CSS::Squish) >= 0.06
+BuildRequires: perl(Data::ICal)
 BuildRequires: perl(Date::Format)
 BuildRequires: perl(DBD::mysql) >= 2.1018
 BuildRequires: perl(DBI) >= 1.37
-BuildRequires: perl(DBIx::SearchBuilder) >= 1.53
+BuildRequires: perl(DBIx::SearchBuilder) >= 1.54
 BuildRequires: perl(Devel::StackTrace) >= 1.19
 BuildRequires: perl(Digest::base)
 BuildRequires: perl(Digest::MD5) >= 2.27
+BuildRequires: perl(Email::Address)
+BuildRequires: perl(Encode) >= 2.13
 BuildRequires: perl(Errno)
+%{?with_devel_mode:BuildRequires: perl(File::Find)}
+BuildRequires: perl(File::Glob)
+BuildRequires: perl(File::ShareDir)
 BuildRequires: perl(File::Spec) >= 0.8
-BuildRequires: perl(File::Temp)
-BuildRequires: perl(GD)
-BuildRequires: perl(GD::Graph)
-BuildRequires: perl(GD::Text)
-BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(File::Temp) >= 0.18
+%{?with_gd:BuildRequires: perl(GD)}
+%{?with_gd:BuildRequires: perl(GD::Graph)}
+%{?with_gd:BuildRequires: perl(GD::Text)}
+%{?with_gpg:BuildRequires: perl(GnuPG::Interface)}
+%{?with_graphviz:BuildRequires: perl(GraphViz)}
 BuildRequires: perl(Getopt::Long) >= 2.24
 BuildRequires: perl(HTML::Entities)
+%{?with_devel_mode:BuildRequires: perl(HTML::Form)}
 BuildRequires: perl(HTML::FormatText)
-BuildRequires: perl(HTML::Mason) >= 1.23
+BuildRequires: perl(HTML::Mason) >= 1.36
+BuildRequires: perl(HTML::RewriteAttributes) >= 0.02
 BuildRequires: perl(HTML::Scrubber) >= 0.08
 BuildRequires: perl(HTML::TreeBuilder)
 BuildRequires: perl(HTTP::Request::Common)
+BuildRequires: perl(HTTP::Server::Simple) >= 0.34
+BuildRequires: perl(HTTP::Server::Simple::Mason) >= 0.09
+%{?with_graphviz:BuildRequires: perl(IPC::Run)}
+%{?with_devel_mode:BuildRequires: perl(IPC::Run3)}
+%{?with_graphviz:BuildRequires: perl(IPC::Run::SafeHandles)}
 BuildRequires: perl(Locale::Maketext) >= 1.06
 BuildRequires: perl(Locale::Maketext::Fuzzy)
 BuildRequires: perl(Locale::Maketext::Lexicon) >= 0.32
 BuildRequires: perl(Log::Dispatch) >= 2.0
+%{?with_devel_mode:BuildRequires: perl(Log::Dispatch::Perl)}
 BuildRequires: perl(LWP)
 BuildRequires: perl(LWP::UserAgent)
 BuildRequires: perl(Mail::Mailer) >= 1.57
-BuildRequires: perl(MIME::Entity) >= 5.108
-BuildRequires: perl(Module::Versions::Report) >= 1.03
+BuildRequires: perl(MIME::Entity) >= 5.425
+BuildRequires: perl(MIME::Types)
+%{?with_devel_mode:BuildRequires: perl(Module::Refresh) >= 0.03}
+BuildRequires: perl(Module::Versions::Report) >= 1.05
+BuildRequires: perl(Net::Server)
+BuildRequires: perl(Net::Server::PreFork)
 BuildRequires: perl(Net::SMTP)
+%{?with_gpg:BuildRequires: perl(PerlIO::eol)}
 BuildRequires: perl(Pod::Usage)
 BuildRequires: perl(Regexp::Common)
 BuildRequires: perl(Scalar::Util)
 BuildRequires: perl(Storable) >= 2.08
+%{?with_devel_mode:BuildRequires: perl(String::ShellQuote)}
 BuildRequires: perl(Term::ReadKey)
 BuildRequires: perl(Term::ReadLine)
-BuildRequires: perl(Text::Autoformat)
+%{?with_devel_mode:BuildRequires: perl(Test::Builder) >= 0.77}
+%{?with_devel_mode:BuildRequires: perl(Test::Deep)}
+%{?with_devel_mode:BuildRequires: perl(Test::Expect) >= 0.31}
+%{?with_devel_mode:BuildRequires: perl(Test::HTTP::Server::Simple) >= 0.09}
+%{?with_devel_mode:BuildRequires: perl(Test::MockTime)}
+%{?with_devel_mode:BuildRequires: perl(Test::Warn)}
+%{?with_devel_mode:BuildRequires: perl(Test::WWW::Mechanize)}
 BuildRequires: perl(Text::ParseWords)
 BuildRequires: perl(Text::Quoted) >= 2.02
 BuildRequires: perl(Text::Template)
@@ -89,8 +145,10 @@
 BuildRequires: perl(Time::ParseDate)
 BuildRequires: perl(Tree::Simple) >= 1.04
 BuildRequires: perl(UNIVERSAL::require)
+%{?with_devel_mode:BuildRequires: perl(WWW::Mechanize)}
 BuildRequires: perl(XML::RSS) >= 1.05
-%endif
+%{?with_devel_mode:BuildRequires: perl(XML::Simple)}
+
 
 BuildRequires:	/usr/bin/pod2man
 BuildRequires:	/usr/sbin/apachectl
@@ -99,24 +157,25 @@
 
 Requires(postun): /bin/rm
 
+# FIXME: The list below needs to be cleaned up
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
 Requires: perl(Calendar::Simple)
-Requires: perl(CSS::Squish)
-Requires: perl(File::Temp)
+# Requires: perl(CSS::Squish)
+# Requires: perl(File::Temp)
 Requires: perl(GD::Text)
 Requires: perl(GD::Graph::bars) perl(GD::Graph::pie)
-Requires: perl(HTML::Mason)
-Requires: perl(HTML::FormatText)
-Requires: perl(HTML::TreeBuilder)
+# Requires: perl(HTML::Mason)
+# Requires: perl(HTML::FormatText)
+# Requires: perl(HTML::TreeBuilder)
 Requires: perl(HTTP::Server::Simple::Mason)
 Requires: perl(I18N::LangTags::List)
 Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
-Requires: perl(MIME::Entity)
+# Requires: perl(MIME::Entity)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
-Requires: perl(Regexp::Common)
+# Requires: perl(Regexp::Common)
 Requires: perl(Tree::Simple)
 Requires: perl(URI::URL)
 
@@ -154,8 +213,9 @@
 find etc -type f -exec chmod a-x {} \;
 
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -173,8 +233,8 @@
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
-    sed -e '/^perl(Encode::compat)$/d' \
-        -e '/^perl(RT::/d'
+    sed -e '/^perl(RT::/d' \
+	-e '/^perl()/d'
 EOF
 %define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
 chmod +x %{__perl_requires}
@@ -207,6 +267,7 @@
 	-e 's,	chgrp,	: chrgp,g' \
 	-e 's,	chown,	: chown,g' \
 	-e 's,$(DESTDIR)/,$(DESTDIR),g' \
+	-e 's,-o $(BIN_OWNER) -g $(RTGROUP),,g' \
 Makefile.in
 
 %build
@@ -214,7 +275,13 @@
 --with-apachectl=/usr/sbin/apachectl \
 --with-web-user=apache --with-web-group=apache \
 --enable-layout=Fedora --with-modperl2 \
---libdir=%{RT3_LIBDIR}
+--with-web-handler=modperl2 \
+--libdir=%{RT3_LIBDIR} \
+%{?with_graphviz:--enable-graphviz}%{!?with_graphviz:--disable-graphviz} \
+%{?with_gd:--enable-gd}%{!?with_gd:--disable-gd} \
+%{?with_gpg:--enable-gpg}%{!?with_gpg:--disable-gpg} \
+%{?with_devel_mode:--enable-devel-mode}%{!?with_devel_mode:--disable-devel-mode}
+
 make %{?_smp_mflags}
 
 # Generate man-pages
@@ -273,16 +340,19 @@
 
 install -d -m755 ${RPM_BUILD_ROOT}%{RT3_LOCALSTATEDIR}
 
+install -d -m755 ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
+cp -R etc/upgrade/* ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
+
 # Fix permissions
 find ${RPM_BUILD_ROOT}%{RT3_WWWDIR} \
   -type f -exec chmod a-x {} \;
 
 %check
-%{?_with_testdeps:make testdeps}
 # The tests don't work:
 # - Require to be run as root
 # - Require an operational rt3 system
-%{?_with_tests:make test}
+# - Require packages which are n/a in Fedora
+%{?with_tests:make test}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -302,6 +372,7 @@
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/rt-mailgate*
 %{RT3_LIBDIR}/*
+%exclude %{RT3_LIBDIR}/RT/Test*
 %attr(0700,apache,apache) %{RT3_LOGDIR}
 
 %dir %{_sysconfdir}/rt3
@@ -333,6 +404,11 @@
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Mon Sep 23 2008 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.1-0
+- First try at public release.
+- Completely rework the spec.
+- Upstream update.
+
 * Wed Jun 26 2008 Ralf Corsépius <rc040203 at freenet.de> - 3.6.7-1
 - Upstream update.
 - Add --with-testdeps.