blob: f2b4e583b62cf95586b2c0b4f695257c0febe6ba (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] [packages-commits] [191611] - new sources
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bpackages-commits%5D%20%5B191611%5D%20-%20new%20sources&In-Reply-To=%3C4F05FC09.40609%40gmail.com%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="010983.html">
<LINK REL="Next" HREF="010986.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] [packages-commits] [191611] - new sources</H1>
<B>Matteo</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bpackages-commits%5D%20%5B191611%5D%20-%20new%20sources&In-Reply-To=%3C4F05FC09.40609%40gmail.com%3E"
TITLE="[Mageia-dev] [packages-commits] [191611] - new sources">pasotti.matteo at gmail.com
</A><BR>
<I>Thu Jan 5 20:37:45 CET 2012</I>
<P><UL>
<LI>Previous message: <A HREF="010983.html">[Mageia-dev] [packages-commits] [191611] - new sources
</A></li>
<LI>Next message: <A HREF="010986.html">[Mageia-dev] [changelog] [RPM] cauldron nonfree/release drakx-installer-images-1.59-2.mga2.nonfree
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#10991">[ date ]</a>
<a href="thread.html#10991">[ thread ]</a>
<a href="subject.html#10991">[ subject ]</a>
<a href="author.html#10991">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Il 05/01/2012 16:38, Jani Välimaa ha scritto:
><i> 2012/1/5 <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">root at mageia.org</A>>:
</I>>><i> Revision 191611 Author matteo Date 2012-01-05 16:10:45 +0100 (Thu, 05 Jan
</I>>><i> 2012)
</I>>><i>
</I>>><i> Log Message
</I>>><i>
</I>>><i> - new sources
</I>>><i> - switched antico launcher icon with mageia icon
</I>>><i>
</I>>><i> Modified Paths
</I>>><i>
</I>>><i> cauldron/antico/current/SPECS/antico.spec
</I>>><i>
</I>>><i> Modified: cauldron/antico/current/SPECS/antico.spec
</I>>><i> ===================================================================
</I>>><i> --- cauldron/antico/current/SPECS/antico.spec 2012-01-05 15:10:00 UTC (rev
</I>>><i> 191610)
</I>>><i> +++ cauldron/antico/current/SPECS/antico.spec 2012-01-05 15:10:45 UTC (rev
</I>>><i> 191611)
</I>>><i> @@ -1,13 +1,16 @@
</I>>><i> -%define git 33b232a
</I>>><i> +#define git 33b232a
</I>>><i> +%define git 74aa84c
</I>>><i>
</I>>><i> Name: antico
</I>>><i> Version: 0.2
</I>>><i> -Release: %mkrel -c git 1
</I>>><i> +Release: %mkrel -c git 2
</I>>><i> Summary: Antico Desktop/Window Manager
</I>>><i> License: GPLv2
</I>>><i> Url: <A HREF="http://www.giuseppecigala.it/Antico.html">http://www.giuseppecigala.it/Antico.html</A>
</I>>><i> #Source0: <A HREF="https://github.com/antico/antico/tarball/master">https://github.com/antico/antico/tarball/master</A>
</I>>><i> -Source: %{name}-%{name}-%{git}.tar.gz
</I>>><i> +Source: pasmatt-%{name}-%{git}.zip
</I>>><i> +#Source: %{name}-%{name}-%{git}.tar.gz
</I>>><i> +Patch0: %{name}-mageia_icon.patch
</I>>><i> Group: Graphical desktop/Other
</I>>><i>
</I>>><i> BuildRequires: qt4-devel
</I>>><i> @@ -23,17 +26,20 @@
</I>>><i> without any other external dependencies.
</I>>><i>
</I>>><i> %prep
</I>>><i> -%setup -q -n %{name}-%{name}-%{git}
</I>>><i> +%setup -q -n pasmatt-%{name}-%{git}
</I>>><i> +%apply_patches
</I>>><i>
</I>>><i> # patch to make antico more modular
</I>>><i> -find . -name "*.cpp" -type f -exec sed -i -e
</I>>><i> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/antico.cfg"|QDir::homePath()
</I>>><i> + "/.antico.cfg"|g' {} \;
</I>>><i> -find . -name "*.cpp" -type f -exec sed -i -e
</I>>><i> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/theme|QDir::rootPath()
</I>>><i> + "usr/share/antico/theme|g' {} \;
</I>>><i> -find . -name "*.cpp" -type f -exec sed -i -e
</I>>><i> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/language|QDir::rootPath()
</I>>><i> + "usr/share/antico/language|g' {} \;
</I>>><i> +# fixed upstream (pasmatt fork on github)
</I>>><i> +#find . -name "*.cpp" -type f -exec sed -i -e
</I>>><i> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/antico.cfg"|QDir::homePath()
</I>>><i> + "/.antico.cfg"|g' {} \;
</I>>><i> +#find . -name "*.cpp" -type f -exec sed -i -e
</I>>><i> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/theme|QDir::rootPath()
</I>>><i> + "usr/share/antico/theme|g' {} \;
</I>>><i> +#find . -name "*.cpp" -type f -exec sed -i -e
</I>>><i> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/language|QDir::rootPath()
</I>>><i> + "usr/share/antico/language|g' {} \;
</I>>><i>
</I>>><i> %build
</I>>><i> %{qmake_qt4}
</I>>><i> -# workaround to allow compilation on mga2 (why?)
</I>>><i> -%make SUBLIBS="-lXext -lX11"
</I>>><i> +# FIXED - workaround to allow compilation on mga2 (why?)
</I>>><i> +#%make SUBLIBS="-lXext -lX11"
</I>>><i> +%make
</I>>><i>
</I>>><i> %install
</I>>><i> %__rm -fr %{buildroot}
</I>>><i>
</I>><i>
</I>><i> Please remove old, obsoleted and not needed parts of .spec instead of
</I>><i> commenting them out. IMHO there's no need to keep eg. 3 different
</I>><i> source tags in .spec. Changes can be restored and reverted from svn
</I>><i> afterwards if needed.
</I>Yes, you're right. I'll clean this spec asap.
Thank you.
- --
Matteo
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mageia - <A HREF="http://enigmail.mozdev.org/">http://enigmail.mozdev.org/</A>
iQEcBAEBAgAGBQJPBfwJAAoJED3LowjDDWbN7zwH/Ax0YYijiwcgHysc4YV8GQT7
Eb9IRRBDs56z8ZXnvG4scjBMEx3BdpeCFY9Mx5rtsuaV/YQzKb0oDwnsnI/TOsXO
RRSVNbUCn2sjWv+wUNK+YSypOYohiQOaK/wf0eRp+NiSAdz+shbaygSlAAInEdGz
7ZS3XxjxfTldNex2TC4YbqscnoyIpsQRvVClIiyK36pMPbSBLNZY8pb80uFnlyHv
wk5ye3jHsKeZtL/SPncShlUnF1KJPHXs49FiNY1RHf603gGZ1CNax4c2H8hyS3kO
G+QBzOICHH/IJpgTUiJzsrHbEN7IOfvQwGYP6aJwSX93eZ+Lls2iaBZT5z6zyqk=
=CveC
-----END PGP SIGNATURE-----
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="010983.html">[Mageia-dev] [packages-commits] [191611] - new sources
</A></li>
<LI>Next message: <A HREF="010986.html">[Mageia-dev] [changelog] [RPM] cauldron nonfree/release drakx-installer-images-1.59-2.mga2.nonfree
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#10991">[ date ]</a>
<a href="thread.html#10991">[ thread ]</a>
<a href="subject.html#10991">[ subject ]</a>
<a href="author.html#10991">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
