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
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] Re : E17 packaging
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Re%20%3A%20%20E17%20packaging&In-Reply-To=%3C4EA40925.1090100%40arcor.de%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="009083.html">
<LINK REL="Next" HREF="009085.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] Re : E17 packaging</H1>
<B>Florian Hubold</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Re%20%3A%20%20E17%20packaging&In-Reply-To=%3C4EA40925.1090100%40arcor.de%3E"
TITLE="[Mageia-dev] Re : E17 packaging">doktor5000 at arcor.de
</A><BR>
<I>Sun Oct 23 14:31:33 CEST 2011</I>
<P><UL>
<LI>Previous message: <A HREF="009083.html">[Mageia-dev] Re : E17 packaging
</A></li>
<LI>Next message: <A HREF="009085.html">[Mageia-dev] Re : Re : E17 packaging
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#9084">[ date ]</a>
<a href="thread.html#9084">[ thread ]</a>
<a href="subject.html#9084">[ subject ]</a>
<a href="author.html#9084">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Am 23.10.2011 14:18, schrieb Philippe Reynes:
><i> Thanks for this feedback,
</I>><i>
</I>><i> here the new eina.spec with all feedbacks :
</I>><i>
</I>><i> Index: eina/SPECS/eina.spec
</I>><i> ===================================================================
</I>><i> --- eina/SPECS/eina.spec (révision 157379)
</I>><i> +++ eina/SPECS/eina.spec (copie de travail)
</I>><i> @@ -1,18 +1,32 @@
</I>><i> %define major 1
</I>><i> %define libname %mklibname %{name} %major
</I>><i> %define libnamedev %mklibname %{name} -d
</I>><i> +%define svn r64324
</I>><i> +%define rel 1
</I>><i> +%if %svn
</I>><i> +%define release %mkrel -c %svn %rel
</I>><i> +%else
</I>><i> +%define release %mkrel %rel
</I>><i> +%endif
</I>><i> Summary: Data Type Library
</I>><i> Name: eina
</I>><i> -Version: 1.0.1
</I>><i> -Release: %mkrel 2
</I>><i> +Version: 1.1.0
</I>><i> +Release: %{release}
</I>><i> License: LGPLv2+
</I>><i> Group: Graphical desktop/Enlightenment
</I>><i> -Source: <A HREF="http://download.enlightenment.org/releases/%{name">http://download.enlightenment.org/releases/%{name</A>}-%{version}.tar.bz2
</I>><i> -URL: <A HREF="http://www.enlightenment.org/">http://www.enlightenment.org/</A>
</I>><i> +# creating archive is quite simple:
</I>><i> +# svn co <A HREF="http://svn.enlightenment.org/svn/e/trunk/eina">http://svn.enlightenment.org/svn/e/trunk/eina</A> eina
</I>><i> +# tar cJf eina-r<svnrevision>.tar.xz eina
</I>><i> +%if %svn
</I>><i> +Source: %name-%svn.tar.xz
</I>><i> +%else
</I>><i> +Source: <A HREF="http://download.enlightenment.org/releases/%name-%version.tar.bz2">http://download.enlightenment.org/releases/%name-%version.tar.bz2</A>
</I>><i> +%endif
</I>><i> +URL: <A HREF="http://trac.enlightenment.org/e/wiki/Eina">http://trac.enlightenment.org/e/wiki/Eina</A>
</I>><i> %description
</I>><i> -Eina is a data type library.
</I>><i> +Eina is a core data structure and common utility library.
</I>><i> %package -n %libname
</I>><i> Summary: Libraries for the %{name} package
</I>><i> @@ -32,10 +46,17 @@
</I>><i> %{name} development headers and libraries.
</I>><i> %prep
</I>><i> -%setup -qn %{name}-%{version}
</I>><i> +%if %svn
</I>><i> +%setup -qn %name
</I>><i> +%else
</I>><i> +%setup -qn %name-%version
</I>><i> +%endif
</I>><i> %build
</I>><i> -%configure2_5x
</I>><i> +%if %svn
</I>><i> +NOCONFIGURE=1 ./autogen.sh
</I>><i> +%endif
</I>><i> +%configure2_5x --disable-static
</I>><i> %make
</I>><i> %install
</I>><i> @@ -44,18 +65,13 @@
</I>><i> find %buildroot -name *.la | xargs rm
</I>><i> -%clean
</I>><i> -rm -fr %buildroot
</I>><i> -
</I>><i> %files -n %libname
</I>><i> -%defattr(-,root,root)
</I>><i> +%doc AUTHORS README
</I>><i> %{_libdir}/*.so.%{major}*
</I>><i> %files -n %libnamedev
</I>><i> -%defattr(-,root,root)
</I>><i> %{_libdir}/pkgconfig/*
</I>><i> %{_libdir}/*.so
</I>><i> -%{_libdir}/*.a
</I>><i> %{_includedir}/*
</I>><i>
</I>><i> regards,
</I>><i> trem
</I>><i>
</I>><i>
</I>><i> -------------------------------------------------------------------------------
</I>><i> *De :* Florian Hubold <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">doktor5000 at arcor.de</A>>
</I>><i> *À :* <A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">mageia-dev at mageia.org</A>
</I>><i> *Envoyé le :* Dimanche 23 Octobre 2011 12h55
</I>><i> *Objet :* Re: [Mageia-dev] E17 packaging
</I>><i>
</I>><i> Am 22.10.2011 14:29, schrieb Balcaen John:
</I>><i> > Le samedi 22 octobre 2011 14:10:53 Florian Hubold a écrit :
</I>><i> > [...]
</I>><i> >> Well, there are "stable" snapshots from time to time, but they are
</I>><i> >> not done regularly. I'd say if we can make local builds of a newer SVN
</I>><i> >> snapshot of the whole E17 before Mageia 2 alpha (i.e. in the next ~20 days)
</I>><i> >> then we should at least try it.
</I>><i> >>
</I>><i> >> BTW: I'd remove the Source URL when only using snapshots or
</I>><i> >> change the SPEC in a way that make using SVN snapshots possible
</I>><i> >> by only changing a macro.
</I>><i> > That's was also suggested on irc :)
</I>><i> >
</I>><i> > Regards,
</I>><i> >
</I>><i> So here's my try, feel free to comment:
</I>><i> (Please don't care about the date format for now :) )
</I>><i>
</I>><i> $ svn diff
</I>><i> Index: eina.spec
</I>><i> ===================================================================
</I>><i> --- eina.spec (Revision 157462)
</I>><i> +++ eina.spec (Arbeitskopie)
</I>><i> @@ -1,3 +1,13 @@
</I>><i> +%define svndate 23102011
</I>><i> +
</I>><i> +%define svn r64322
</I>><i> +%if %svn
</I>><i> +%define rel 0.%{svn}svn.1
</I>><i> +%else
</I>><i> +%define rel 1
</I>><i> +%endif
</I>><i> +
</I>><i> +
</I>><i> %define major 1
</I>><i> %define libname %mklibname %{name} %major
</I>><i> %define libnamedev %mklibname %{name} -d
</I>><i> @@ -4,11 +14,18 @@
</I>><i>
</I>><i> Summary: Data Type Library
</I>><i> Name: eina
</I>><i> -Version: 1.0.1
</I>><i> -Release: %mkrel 2
</I>><i> +Version: 1.0.999
</I>><i> +Release: %mkrel %rel
</I>><i> License: LGPLv2+
</I>><i> Group: Graphical desktop/Enlightenment
</I>><i> +# export latest svn checkout
</I>><i> +# svn export <A HREF="http://svn.enlightenment.org/svn/e/trunk/%{name">http://svn.enlightenment.org/svn/e/trunk/%{name</A>}
</I>><i> %{name}-svn-$(date +%d%m%Y)
</I>><i> +%if %svn
</I>><i> +Source: %{name}-svn-%svndate.tar.bz2
</I>><i> +%else
</I>><i> Source: <A HREF="http://download.enlightenment.org/releases/%{name">http://download.enlightenment.org/releases/%{name</A>}-%{version}.tar.bz2
</I>><i> +%endif
</I>><i> +
</I>><i> URL: <A HREF="http://www.enlightenment.org/">http://www.enlightenment.org/</A>
</I>><i>
</I>><i> %description
</I>><i> @@ -32,9 +49,17 @@
</I>><i> %{name} development headers and libraries.
</I>><i>
</I>><i> %prep
</I>><i> +%if %svn
</I>><i> +%setup -qn %{name}-svn-%svndate
</I>><i> +%else
</I>><i> %setup -qn %{name}-%{version}
</I>><i> +%endif
</I>><i>
</I>><i> +
</I>><i> %build
</I>><i> +%if %svn
</I>><i> +./autogen.sh
</I>><i> +%endif
</I>><i> %configure2_5x
</I>><i> %make
</I>><i>
</I>><i>
</I>><i>
</I>Don't do an svn checkout for such purposes, an svn export is much lighter
and already excludes all the .svn internal VCS files. Also the version is not
correct,
eina is not at 1.1.0 as e17 is also not at version 0.17.
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="009083.html">[Mageia-dev] Re : E17 packaging
</A></li>
<LI>Next message: <A HREF="009085.html">[Mageia-dev] Re : Re : E17 packaging
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#9084">[ date ]</a>
<a href="thread.html#9084">[ thread ]</a>
<a href="subject.html#9084">[ subject ]</a>
<a href="author.html#9084">[ 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>
|
