/[smecontribs]/rpms/smeserver-mnemo/contribs8/smeserver-mnemo-2.2.2.patch
ViewVC logotype

Contents of /rpms/smeserver-mnemo/contribs8/smeserver-mnemo-2.2.2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Thu Jul 8 15:01:13 2010 UTC (14 years, 3 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-mnemo-2_2-5_el5_sme, smeserver-mnemo-2_2-4_el5_sme, HEAD
Import for sme8

1 diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade
2 --- smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade 2008-05-24 17:25:14.000000000 -0500
3 +++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade 2009-10-08 15:43:25.000000000 -0500
4 @@ -46,6 +46,21 @@
5
6 # These are all safe to run multiple times
7
8 +my @statements = (
9 + "ALTER TABLE mnemo_memos CHANGE COLUMN memo_id memo_id VARCHAR(255) NOT NULL",
10 + "ALTER TABLE mnemo_memos CHANGE COLUMN memo_category memo_category VARCHAR(80)",
11 + "ALTER TABLE mnemo_memos CHANGE COLUMN memo_private memo_private SMALLINT NOT NULL default 0",
12 + "ALTER TABLE mnemo_shares_groups CHANGE group_uid group_uid VARCHAR(255)"
13 +);
14 +
15 +foreach my $statement (@statements)
16 +{
17 + $statement =
18 + $db_mnemohandle->prepare("$statement")
19 + or die "prepare: $$statement: $DBI::errstr";
20 + $statement->execute or die "execute: $$statement: $DBI::errstr";
21 +}
22 +
23 # We now need to create some columns, but we need to first check
24 # whether they exist already
25 my $sth = $db_mnemohandle->prepare("show columns from mnemo_memos");
26 @@ -88,42 +103,6 @@
27 $statement->execute or die "execute: $$statement: $DBI::errstr";
28 }
29
30 -unless (defined $mnemo_memos->{memo_id})
31 -{
32 - # We need to be careful about this one as it will fail if the
33 - # column exists, so we check the error.
34 - my $statement =
35 - "ALTER TABLE mnemo_memos CHANGE COLUMN memo_id memo_id ".
36 - "VARCHAR(255) NOT NULL";
37 - $statement = $db_mnemohandle->prepare($statement) or
38 - die "prepare: $$statement: $DBI::errstr";
39 - $statement->execute or die "execute: $$statement: $DBI::errstr";
40 -}
41 -
42 -unless (defined $mnemo_memos->{memo_category})
43 -{
44 - # We need to be careful about this one as it will fail if the
45 - # column exists, so we check the error.
46 - my $statement =
47 - "ALTER TABLE mnemo_memos CHANGE COLUMN memo_category memo_category ".
48 - "VARCHAR(80)";
49 - $statement = $db_mnemohandle->prepare($statement) or
50 - die "prepare: $$statement: $DBI::errstr";
51 - $statement->execute or die "execute: $$statement: $DBI::errstr";
52 -}
53 -
54 -unless (defined $mnemo_memos->{memo_private})
55 -{
56 - # We need to be careful about this one as it will fail if the
57 - # column exists, so we check the error.
58 - my $statement =
59 - "ALTER TABLE mnemo_memos CHANGE COLUMN memo_private memo_private ".
60 - "SMALLINT NOT NULL default 0";
61 - $statement = $db_mnemohandle->prepare($statement) or
62 - die "prepare: $$statement: $DBI::errstr";
63 - $statement->execute or die "execute: $$statement: $DBI::errstr";
64 -}
65 -
66 # Create an index for memo_owner if needed
67 unless ($mnemo_memos->{memo_owner}->{Key})
68 {
69 diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header
70 --- smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header 2009-10-08 15:44:02.000000000 -0500
71 +++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header 2009-10-08 15:02:58.000000000 -0500
72 @@ -1,7 +1,7 @@
73
74 //00Header
75 /**
76 - * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.4 2008/06/13 14:44:04 jan Exp $
77 + * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.5 2009/06/19 17:06:22 jan Exp $
78 *
79 * See horde/config/prefs.php for documentation on the structure of this file.
80 */
81 diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display
82 --- smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display 2008-04-06 23:55:40.000000000 -0500
83 +++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display 2009-10-08 15:04:11.000000000 -0500
84 @@ -3,6 +3,6 @@
85 'column' => _("General Options"),
86 'label' => _("Display Options"),
87 'desc' => _("Change your note sorting and display options."),
88 - 'members' => array('show_notepad', 'show_panel', 'sortby', 'sortdir')
89 + 'members' => array('show_notepad', 'sortby', 'sortdir')
90 );
91
92 diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel
93 --- smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel 2008-04-07 00:05:18.000000000 -0500
94 +++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel 2009-10-08 15:05:25.000000000 -0500
95 @@ -5,7 +5,6 @@
96 'value' => 1,
97 'locked' => false,
98 'shared' => false,
99 - 'type' => 'checkbox',
100 - 'desc' => _("Show notepad options panel?")
101 + 'type' => 'implicit',
102 );
103
104 diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql mezzanine_patched_smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql
105 --- smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql 2008-06-18 22:57:43.000000000 -0500
106 +++ mezzanine_patched_smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql 2009-10-08 15:41:47.000000000 -0500
107 @@ -27,7 +27,7 @@
108
109 CREATE TABLE IF NOT EXISTS mnemo_shares_groups (
110 share_id INT NOT NULL,
111 - group_uid INT NOT NULL,
112 + group_uid VARCHAR(255) NOT NULL,
113 perm SMALLINT NOT NULL
114 );
115

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed