- save (3.0rc1)

Changed files:
    bugzilla-pld.patch -> 1.6
    bugzilla.spec -> 1.31

diff --git a/bugzilla-pld.patch b/bugzilla-pld.patch
index ccade41ea92830f233224f870ad1980a95b10988..f274a327c3aa28265321b6038fe4dceac3a4a52c 100644 (file)
--- a/bugzilla-pld.patch
+++ b/bugzilla-pld.patch
@@ -1,116 +1,3 @@
---- bugzilla-2.22/Bugzilla/Config.pm   2006-04-24 02:50:00.901038343 +0300
-+++ bugzilla-2.22.2/Bugzilla/Config.pm 2007-04-04 08:59:05.403817641 +0300
-@@ -53,7 +53,7 @@
- # some point.
- 
- # constant paths
--our $libpath = '.';
-+our $libpath = '/usr/share/bugzilla';
- 
- # importxml.pl, when run by a mail daemon, sets the bugzilla path explicitly.
- # This then mucks it up, so if we are coming from importxml.pl, set $libpath
-@@ -64,8 +64,8 @@
-     $localconfig = "$libpath/localconfig.$project";
-     $datadir = "$libpath/data/$project";
- } else {
--    $localconfig = "$libpath/localconfig";
--    $datadir = "$libpath/data";
-+    $localconfig = "/etc/webapps/bugzilla/localconfig.pl";
-+    $datadir = "/var/lib/bugzilla/data";
- }
- our $attachdir = "$datadir/attachments";
- our $webdotdir = "$datadir/webdot";
-@@ -147,7 +147,7 @@
- my %params;
- 
- # Load in the param definitions
--foreach my $item ((glob "$libpath/Bugzilla/Config/*.pm")) {
-+foreach my $item ((glob "/usr/share/perl5/vendor_perl/Bugzilla/Config/*.pm")) {
-     $item =~ m#/([^/]+)\.pm$#;
-     my $module = $1;
-     next if ($module eq 'Common');
---- ./checksetup.pl    2006-04-24 22:03:58.576110738 +0300
-+++ ./checksetup.pl    2006-04-24 22:09:50.783963305 +0300
-@@ -596,7 +596,7 @@
- 
- my $webservergroup_default;
- if ($^O !~ /MSWin32/i) {
--    $webservergroup_default = 'apache';
-+    $webservergroup_default = 'http';
- } else {
-     $webservergroup_default = '';
- }
-@@ -872,10 +872,10 @@
- # a Bugzilla with the old data format, and upgrade their data files.
- 
- # NB - the graphs dir isn't movable yet, unlike the datadir
--unless (-d 'graphs') {
-+unless (-d '/var/lib/bugzilla/graphs') {
-     print "Creating graphs directory...\n";
-     # permissions for non-webservergroup are fixed later on
--    mkdir 'graphs', 0770;
-+    mkdir '/var/lib/bugzilla/graphs', 0770;
-     # Upgrade data format
-     foreach my $in_file (glob("$datadir/mining/*"))
-     {
-@@ -965,13 +965,6 @@
-     mkdir "skins/custom", 0700;
- }
- 
--if (!-e "skins/.cvsignore") {
--    open CVSIGNORE, '>>', "skins/.cvsignore";
--    print CVSIGNORE ".cvsignore\n";
--    print CVSIGNORE "custom\n";
--    close CVSIGNORE;
--}
--
- # Create custom stylesheets for each standard stylesheet.
- foreach my $standard (<skins/standard/*.css>) {
-     my $custom = $standard;
-@@ -1368,8 +1361,6 @@
-         # chown needs to be called with a valid uid, not 0.  $< returns the
-         # caller's uid.  Maybe there should be a $bugzillauid, and call 
-         # with that userid.
--        fixPerms('.htaccess', $<, $webservergid, 027); # glob('*') doesn't catch dotfiles
--        fixPerms("$datadir/.htaccess", $<, $webservergid, 027);
-         fixPerms("$datadir/duplicates", $<, $webservergid, 027, 1);
-         fixPerms("$datadir/mining", $<, $webservergid, 027, 1);
-         fixPerms("$datadir/template", $<, $webservergid, 007, 1); # webserver will write to these
-@@ -1377,21 +1368,11 @@
-         fixPerms($webdotdir, $<, $webservergid, 007, 1);
-         fixPerms("$webdotdir/.htaccess", $<, $webservergid, 027);
-         fixPerms("$datadir/params", $<, $webservergid, 017);
--        fixPerms('*', $<, $webservergid, 027);
--        fixPerms('Bugzilla', $<, $webservergid, 027, 1);
--        fixPerms($templatedir, $<, $webservergid, 027, 1);
--        fixPerms('images', $<, $webservergid, 027, 1);
--        fixPerms('css', $<, $webservergid, 027, 1);
--        fixPerms('skins', $<, $webservergid, 027, 1);
--        fixPerms('js', $<, $webservergid, 027, 1);
--        chmod 0644, 'globals.pl';
-         
-         # Don't use fixPerms here, because it won't change perms 
-         # on the directory unless it's using recursion
--        chown $<, $webservergid, $datadir;
--        chmod 0771, $datadir;
--        chown $<, $webservergid, 'graphs';
--        chmod 0770, 'graphs';
-+        chown $<, $webservergid, '/var/lib/bugzilla/graphs';
-+        chmod 0770, '/var/lib/bugzilla/graphs';
-     } else {
-         # get current gid from $( list
-         my $gid = (split " ", $()[0];
-@@ -1416,8 +1397,8 @@
-         # on the directory unless it's using recursion
-         chown $<, $gid, $datadir;
-         chmod 0777, $datadir;
--        chown $<, $gid, 'graphs';
--        chmod 01777, 'graphs';
-+        chown $<, $gid, '/var/lib/bugzilla/graphs';
-+        chmod 01777, '/var/lib/bugzilla/graphs';
-     }
- }
- 
 --- a/collectstats.pl  2005-01-21 08:57:30.975582527 +0200
 +++ a/collectstats.pl  2006-04-24 23:04:25.847159729 +0300
 @@ -48,7 +48,7 @@
@@ -133,14 +20,3 @@
      open(RDF, ">$datadir/duplicates.tmp")
          || die "can't write to $datadir/duplicates.tmp: $!";
      my $headers_done = 0;
---- ./checksetup.pl    2006-04-24 22:03:58.576110738 +0300
-+++ ./checksetup.pl    2006-04-24 22:09:50.783963305 +0300
-@@ -659,7 +659,7 @@
- # <Directory> blocks.)
- # If this is set to 1, Bugzilla will create these files if they don't exist.
- # If this is set to 0, Bugzilla will not create these files.
--$create_htaccess = 1;
-+$create_htaccess = 0;
- END
- 
- my $webservergroup_default;

diff --git a/bugzilla.spec b/bugzilla.spec
index e7e7ffc5c1e4faa177292be5c0cd185cb6f85b69..a84a9b55db9125330c84dc4e8fe44902a9a2353e 100644 (file)
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -1,16 +1,18 @@
 # TODO
 # - Split DB packages for mysql/pgsql
 # - fill brr and add autodeps bcond
+%define                _rc             rc1
+%define                _rel    0.2
 %include       /usr/lib/rpm/macros.perl
 Summary:       Bug tracking system
 Summary(pl.UTF-8):     System śledzenia błędów
 Name:          bugzilla
-Version:       2.22.2
-Release:       0.1
+Version:       3.0
+Release:       0.%{_rc}.%{_rel}
 License:       GPL
 Group:         Applications/WWW
-Source0:       http://ftp.mozilla.org/pub/mozilla.org/webtools/%{name}-%{version}.tar.gz
-# Source0-md5: fb7fdcaacf5efad6f3bd5a1a810c467f
+Source0:       http://ftp.mozilla.org/pub/mozilla.org/webtools/%{name}-%{version}%{_rc}.tar.gz
+# Source0-md5: 638dc6ef374874806f3388c9bf24c802
 Source1:       %{name}.conf
 Source2:       %{name}-localconfig.pl
 Source3:       %{name}.cron
@@ -20,7 +22,9 @@ BuildRequires:        rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
 Requires:      perl-DBD-mysql
-Requires:      perl-DBI >= 1.36
+Requires:      perl-DBI >= 1.41
+Requires:      perl(Email::Send) >= 2.00
+Requires:      perl(Email::MIME::Modifier)
 Requires:      perl-MailTools >= 1.67
 Requires:      smtpdaemon
 Requires:      webapps
@@ -32,7 +36,16 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysconfdir     %{_webapps}/%{_webapp}
 %define                _appdir         %{_datadir}/%{_webapp}
 # Don't enforce DBD driver and exclude optional packages according to release notes
-%define                _noautoreq              'perl(DBD::*)' perl(Chart::Base) perl(GD) perl(GD::Graph) perl(GD::Text::Align) perl(Net::LDAP) perl(PatchReader) perl(XML::Twig) perl(Image::Magick)
+%define                _noautoreq              'perl(DBD::.*)' perl(Chart::Base) perl(GD) perl(GD::Graph) perl(GD::Text::Align) perl(Net::LDAP) perl(PatchReader) perl(XML::Twig) perl(Image::Magick)
+
+#D perl-Apache-DBI-1.01-1, perl-AppConfig-1.56-2, perl-BSD-Resource-1.28-1, perl-Class-Inspector-1.16-1,
+#D perl-DBD-Pg-1.49-1, perl-Data-Flow-0.09-2, perl-Email-Abstract-2.13-1, perl-Email-Address-1.86-1,
+#D perl-Email-MIME-1.85-1, perl-Email-MIME-Attachment-Stripper-1.3-1, perl-Email-MIME-ContentType-1.0-1,
+#D perl-Email-MIME-Creator-1.45-1, perl-Email-MIME-Encodings-1.3-2, perl-Email-MIME-Modifier-1.43-1,
+#D perl-Email-MessageID-1.35-1, perl-Email-Reply-1.1-1, perl-Email-Send-1.46-1, perl-Email-Simple-1.96-1,
+#D perl-Email-Simple-Creator-1.41-1, perl-IO-All-0.33-2, perl-IO-String-1.08-1, perl-Module-Pluggable-3.1-4,
+#D perl-Return-Value-1.28-1, perl-Spiffy-0.30-1, perl-Template-Toolkit-2.15-1, perl-mixin-0.04-1, perl-mod_perl-2.0.3-2
+
 
 %description
 Bugzilla is the Bug-Tracking System from the Mozilla project.
@@ -41,7 +54,7 @@ Bugzilla is the Bug-Tracking System from the Mozilla project.
 System śledzenia błędów.
 
 %prep
-%setup -q
+%setup -q %{?_rc:-n %{name}-%{version}%{_rc}}
 %patch0 -p1
 
 sed -i -e '