Author: xavierb
Update of /cvs/pkgs/rpms/rt3/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4483
Modified Files:
rt3.spec sources
Added Files:
rt-3.8.6-test-dependencies.diff rt-3.8.8-Makefile.diff
rt-3.8.8-config.diff
Removed Files:
rt-3.8.4-Makefile.diff rt-3.8.4-config.diff
rt-3.8.4-rh-bz526870.diff rt-3.8.4-rh-bz543962.diff
rt-3.8.4-test-dependencies.diff
Log Message:
- Update to 3.8.8 (Sync with Rawhide).
rt-3.8.6-test-dependencies.diff:
rt-test-dependencies.in | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE rt-3.8.6-test-dependencies.diff ---
diff -Naur rt-3.8.6.orig/sbin/rt-test-dependencies.in rt-3.8.6/sbin/rt-test-dependencies.in
--- rt-3.8.6.orig/sbin/rt-test-dependencies.in 2009-10-19 21:55:31.000000000 +0200
+++ rt-3.8.6/sbin/rt-test-dependencies.in 2009-12-04 15:44:07.000000000 +0100
@@ -278,7 +278,6 @@
$deps{'DEV'} = [ text_to_hash( << '.') ];
HTML::Form
-HTML::TokeParser
WWW::Mechanize
Test::WWW::Mechanize 1.04
Module::Refresh 0.03
rt-3.8.8-Makefile.diff:
Makefile.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE rt-3.8.8-Makefile.diff ---
--- rt-3.8.8.orig/Makefile.in 2010-05-05 22:09:21.000000000 +0200
+++ rt-3.8.8/Makefile.in 2010-05-06 10:46:27.000000000 +0200
@@ -286,7 +286,7 @@
@echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
-upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
+upgrade: testdeps config-install dirs files-install upgrade-instruct
upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install font-install fixperms
@@ -367,7 +367,7 @@
$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
# }}}
-install: testdeps config-install dirs files-install fixperms instruct
+install: testdeps config-install dirs files-install instruct
files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install
@@ -431,9 +431,9 @@
# {{{ font-install
font-install:
@COMMENT_INPLACE_LAYOUT@ [ -d $(DESTDIR)$(RT_FONT_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
-@COMMENT_INPLACE_LAYOUT@ -( cd share/fonts && find . -type f -print ) | while read file ; do \
-@COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0644 "share/fonts/$$file" "$(DESTDIR)$(RT_FONT_PATH)/$$file" ; \
-@COMMENT_INPLACE_LAYOUT@ done
+@COMMENT_INPLACE_LAYOUT@ #-( cd share/fonts && find . -type f -print ) | while read file ; do \
+@COMMENT_INPLACE_LAYOUT@ # $(INSTALL) -m 0644 "share/fonts/$$file" "$(DESTDIR)$(RT_FONT_PATH)/$$file" ; \
+@COMMENT_INPLACE_LAYOUT@ #done
# }}}
# {{{ doc-install
rt-3.8.8-config.diff:
RT_SiteConfig.pm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
--- NEW FILE rt-3.8.8-config.diff ---
--- rt-3.8.8.orig/etc/RT_SiteConfig.pm 2010-05-05 22:09:21.000000000 +0200
+++ rt-3.8.8/etc/RT_SiteConfig.pm 2010-05-07 07:30:57.000000000 +0200
@@ -12,8 +12,19 @@
# going to run into trouble. To check your SiteConfig file, use
# this comamnd:
#
-# perl -c /path/to/your/etc/RT_SiteConfig.pm
+# perl -c /etc/rt3/RT_SiteConfig.pm
Set( $rtname, 'example.com');
-#Set(@Plugins,(qw(Extension::QuickDelete RT::FM)));
+
+# Set( $Organization , "example.com");
+
+# Look into the zoneinfo database for valid values (/usr/share/zoneinfo/)
+# Set( $Timezone , 'US/Eastern');
+
+# Set( $RTAddressRegexp, '(^rt3.*\@example\.com$)' );
+
+# Set( $WebBaseURL , "http://localhost";);
+
+Set( $WebPath , "/rt3");
+
1;
Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-6/rt3.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- rt3.spec 14 Dec 2009 08:44:12 -0000 1.47
+++ rt3.spec 7 Jul 2010 20:47:44 -0000 1.48
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, Ralf Corsepius, Ulm, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -39,8 +39,8 @@
%define RT3_LOCALSTATEDIR %{_localstatedir}/lib/rt3
Name: rt3
-Version: 3.8.4
-Release: 8%{?dist}
+Version: 3.8.8
+Release: 2%{?dist}
Summary: Request tracker 3
Group: Applications/Internet
@@ -51,19 +51,9 @@ Source3: rt3.conf.in
Source4: README.fedora.in
Source5: rt3.logrotate.in
-Patch0: rt-3.8.4-config.diff
-Patch2: rt-3.8.4-Makefile.diff
-Patch3: rt-3.8.4-test-dependencies.diff
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=526870
-# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
-# Fixed in rt >= 3.8.5
-Patch5: rt-3.8.4-rh-bz526870.diff
-
-# http://bugzilla.redhat.com/show_bug.cgi?id=543962
-# Patch from http://bestpractical.typepad.com/files/rt-3.8-session_fixation.patch
-# Fixed in rt >= 3.8.6
-Patch6: rt-3.8.4-rh-bz543962.diff
+Patch0: rt-3.8.8-config.diff
+Patch2: rt-3.8.8-Makefile.diff
+Patch3: rt-3.8.6-test-dependencies.diff
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -159,10 +149,20 @@ BuildRequires: perl(UNIVERSAL::require)
BuildRequires: perl(XML::RSS) >= 1.05
%{?with_devel_mode:BuildRequires: perl(XML::Simple)}
+%{?with_tests:BuildRequires: perl(DBD::SQLite)}
+%{?with_tests:BuildRequires: perl(DBD::mysql)}
+%{?with_tests:BuildRequires: perl(DBD::Pg)}
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/sbin/apachectl
+# the original sources carry bundled versions of these
+Requires: /usr/share/fonts/google-droid/DroidSansFallback.ttf
+Requires: /usr/share/fonts/google-droid/DroidSans.ttf
+
+BuildRequires: /usr/share/fonts/google-droid/DroidSansFallback.ttf
+BuildRequires: /usr/share/fonts/google-droid/DroidSans.ttf
+
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires(postun): /bin/rm
@@ -216,7 +216,7 @@ Requires: perl(HTML::FormatText)
%description mailgate
%{summary}
-%if 0%{?with_devel_mode}
+%if %{with devel_mode}
%package -n perl-RT-Test
Summary: rt3's test utility.
Group: Applications/Internet
@@ -241,11 +241,12 @@ find . \( -name '*.pm' -o -name '*.pm.in
chmod -x UPGRADING README C* aclocal.* config.* *.ac *.in
find etc -type f -exec chmod a-x {} \;
+# Upstream tarball contains temporary autotools-files.
+rm -rf autom4te.cache config.log config.status
+
%patch0 -p1
%patch2 -p1
%patch3 -p1
-%patch5 -p1
-%patch6 -p1
# Patch backups added by rpm disturb
find -name '*.orig' -exec rm -f {} \;
@@ -282,6 +283,7 @@ cat << \EOF >> config.layout
manualdir: ${datadir}/doc
localstatedir: %{RT3_LOCALSTATEDIR}
htmldir: %{RT3_WWWDIR}
+ fontdir: %{_datadir}/rt3/fonts
logfiledir: %{RT3_LOGDIR}
masonstatedir: %{RT3_CACHEDIR}/mason_data
sessionstatedir: %{RT3_CACHEDIR}/session_data
@@ -306,7 +308,8 @@ Makefile.in
%configure \
--with-apachectl=/usr/sbin/apachectl \
--with-web-user=apache --with-web-group=apache \
---enable-layout=Fedora --with-modperl2 \
+--with-db-type=mysql \
+--enable-layout=Fedora \
--with-web-handler=modperl2 \
--libdir=%{RT3_LIBDIR} \
%{?with_graphviz:--enable-graphviz}%{!?with_graphviz:--disable-graphviz} \
@@ -378,6 +381,10 @@ install -d -m755 ${RPM_BUILD_ROOT}%{_sys
cp -R etc/upgrade/* ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade
rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/rt3/upgrade/*.in
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/rt3/fonts
+ln -s /usr/share/fonts/google-droid/DroidSans.ttf ${RPM_BUILD_ROOT}%{_datadir}/rt3/fonts
+ln -s /usr/share/fonts/google-droid/DroidSansFallback.ttf ${RPM_BUILD_ROOT}%{_datadir}/rt3/fonts
+
# Fix permissions
find ${RPM_BUILD_ROOT}%{RT3_WWWDIR} \
-type f -exec chmod a-x {} \;
@@ -421,6 +428,8 @@ fi
%dir %{_datadir}/rt3
%{RT3_WWWDIR}
+%{_datadir}/rt3/fonts
+
%config(noreplace) %{_sysconfdir}/httpd/conf.d/rt3.conf
%dir %{RT3_CACHEDIR}
@@ -439,12 +448,17 @@ fi
%{_sbindir}/rt-mailgate
%{_mandir}/man1/rt-mailgate*
+%if %{with devel_mode}
%files -n perl-RT-Test
%defattr(-,root,root,-)
%dir %{RT3_LIBDIR}/RT
%{RT3_LIBDIR}/RT/Test*
+%endif
%changelog
+* Wed Jul 07 2010 Xavier Bachelot <xavier@xxxxxxxxxxxx> - 3.8.8-2
+- Update to 3.8.8 (Sync with Rawhide).
+
* Mon Dec 14 2009 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.4-8
- Add UPGRADING.mysql, perl(Text::Quoted), R: perl(Text::WikiFormat)
(BZ #546786; Thanks to Dale Bewley <dale@xxxxxxxxxxxxxxxxx>)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 19 Jun 2009 04:13:40 -0000 1.14
+++ sources 7 Jul 2010 20:47:44 -0000 1.15
@@ -1 +1 @@
-cdfdbd954203a8bc2c663a6847218ccc rt-3.8.4.tar.gz
+de062840ce6e2fdb323d77dddf8ff485 rt-3.8.8.tar.gz
--- rt-3.8.4-Makefile.diff DELETED ---
--- rt-3.8.4-config.diff DELETED ---
--- rt-3.8.4-rh-bz526870.diff DELETED ---
--- rt-3.8.4-rh-bz543962.diff DELETED ---
--- rt-3.8.4-test-dependencies.diff DELETED ---
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
