- up to 4.0.4

Changed files:
    rt-git.patch -> 1.2
    rt.spec -> 1.95

diff --git a/rt-git.patch b/rt-git.patch
deleted file mode 100644 (file)
index a85fbfc..0000000
--- a/rt-git.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit da71990c74342f5370bf54408f86f1bf5d1bf2b9
-Author: sunnavy <sunnavy@bestpractical.com>
-Date:   Mon Aug 22 05:40:59 2011 +0800
-
-    show same page menu in simple search as in normal search if there is query
-
-diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
-index ff2055b..f4e8ce91 100755
---- a/share/html/Elements/Tabs
-+++ b/share/html/Elements/Tabs
-@@ -571,7 +571,7 @@ my $build_admin_menu = sub {
-             }
-         }
-     }
--    if ( $request_path =~ m{^/(?:Ticket|Search)/} && $request_path !~ m{^/Search/Simple\.html}) {
-+    if ( $request_path =~ m{^/(?!Search/Simple\.html)(?:Ticket|Search)/} || $request_path =~ m{^/Search/Simple\.html} && $m->request_args->{'q'} ) {
-         my $search = Menu()->child('search');
-         my $args      = '';
-         my $has_query = '';

diff --git a/rt.spec b/rt.spec
index e71cd98578f7bf53fa15c16c697a611c93aceadb..98505e14de19dc93a98106a4a40dfcf8f6faf447 100644 (file)
--- a/rt.spec
+++ b/rt.spec
@@ -41,18 +41,17 @@
 Summary:       Request Tracker
 Summary(pl.UTF-8):     Request Tracker - system do śledzenia zleceń
 Name:          rt
-Version:       4.0.2
-Release:       2
+Version:       4.0.4
+Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://download.bestpractical.com/pub/rt/release/%{name}-%{version}.tar.gz
-# Source0-md5: afa50685a81d249c643b97fdc5eaabf2
+# Source0-md5: 7bbfe24c3e3b6fb64c62a43769780093
 Source1:       %{name}-apache_dir.conf
 Source2:       %{name}-apache_vhost.conf
 Source3:       %{name}-apache.conf
 Patch0:                %{name}-layout.patch
 Patch1:                %{name}-config.patch
-Patch2:                %{name}-git.patch
 URL:           http://www.bestpractical.com/rt/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -249,7 +248,6 @@ z innymi narzędziami.
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 mv aclocal.m4 acinclude.m4