Author: corsepiu Update of /cvs/pkgs/rpms/rt3/devel In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10735 Modified Files: .cvsignore rt3.spec sources Added Files: rt-3.8.8-Makefile.diff rt-3.8.8-config.diff Removed Files: rt-3.8.4-config.diff rt-3.8.6-Makefile.diff Log Message: * Fri May 07 2010 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.8-1 - Upstream update. - Add %{_datadir}/rt3/fonts - Use system-wide google-droid-fonts instead of bundled Droid fonts. - Add rt-3.8.8-Makefile.diff. - Remove rt-3.8.6-Makefile.diff. - Add rt-3.8.8-config.diff. - Remove rt-3.8.4-config.diff - Misc. spec file massaging. 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: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- .cvsignore 14 Dec 2009 08:42:55 -0000 1.17 +++ .cvsignore 7 May 2010 05:33:42 -0000 1.18 @@ -1 +1 @@ -rt-3.8.7.tar.gz +rt-3.8.8.tar.gz Index: rt3.spec =================================================================== RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- rt3.spec 22 Mar 2010 16:40:24 -0000 1.50 +++ rt3.spec 7 May 2010 05:33:43 -0000 1.51 @@ -39,8 +39,8 @@ %define RT3_LOCALSTATEDIR %{_localstatedir}/lib/rt3 Name: rt3 -Version: 3.8.7 -Release: 2%{?dist} +Version: 3.8.8 +Release: 1%{?dist} Summary: Request tracker 3 Group: Applications/Internet @@ -51,8 +51,8 @@ Source3: rt3.conf.in Source4: README.fedora.in Source5: rt3.logrotate.in -Patch0: rt-3.8.4-config.diff -Patch2: rt-3.8.6-Makefile.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 @@ -149,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 @@ -231,6 +241,9 @@ 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 @@ -270,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 @@ -294,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} \ @@ -366,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 {} \; @@ -409,6 +428,8 @@ fi %dir %{_datadir}/rt3 %{RT3_WWWDIR} +%{_datadir}/rt3/fonts + %config(noreplace) %{_sysconfdir}/httpd/conf.d/rt3.conf %dir %{RT3_CACHEDIR} @@ -435,6 +456,17 @@ fi %endif %changelog +* Fri May 07 2010 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.8-1 +- Upstream update. +- Add %{_datadir}/rt3/fonts +- Use system-wide google-droid-fonts instead of bundled + Droid fonts. +- Add rt-3.8.8-Makefile.diff. +- Remove rt-3.8.6-Makefile.diff. +- Add rt-3.8.8-config.diff. +- Remove rt-3.8.4-config.diff +- Misc. spec file massaging. + * Mon Mar 22 2010 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.7-2 - Make building --without devel_mode working (BZ 575780). Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- sources 14 Dec 2009 08:42:55 -0000 1.17 +++ sources 7 May 2010 05:33:43 -0000 1.18 @@ -1 +1 @@ -1e269e88cb03a94f7992b115d4d0828a rt-3.8.7.tar.gz +de062840ce6e2fdb323d77dddf8ff485 rt-3.8.8.tar.gz --- rt-3.8.4-config.diff DELETED --- --- rt-3.8.6-Makefile.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