summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html
diff options
context:
space:
mode:
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html')
-rw-r--r--zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html9
1 files changed, 9 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html b/zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html
new file mode 100644
index 000000000..250c467c8
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html
@@ -0,0 +1,9 @@
+<html><body><div style="color:#000; background-color:#fff; font-family:times new roman, new york, times, serif;font-size:12pt"><div><span><br></span></div><div><span>In fact, autogen.sh use svnversion to generate some files.</span></div><div><span>So, if I only do an svn export, the compilation fails.</span></div><div><span><br></span></div><div><span>I've used eina 1.1.0, because, it should be the next release.</span></div><div>But I could use another "version", if people prefers.</div><div><span><br></span></div><div><br></div><div style="font-size: 12pt; font-family: 'times new roman', 'new york', times, serif; "><div style="font-size: 12pt; font-family: 'times new roman', 'new york', times, serif; "><font size="2" face="Arial"><hr size="1"><b><span style="font-weight:bold;">De&nbsp;:</span></b> Florian Hubold &lt;doktor5000@arcor.de&gt;<br><b><span style="font-weight: bold;">À&nbsp;:</span></b> Mageia development mailing-list
+ &lt;mageia-dev@mageia.org&gt;<br><b><span style="font-weight: bold;">Envoyé le :</span></b> Dimanche 23 Octobre 2011 14h31<br><b><span style="font-weight: bold;">Objet&nbsp;:</span></b> Re: [Mageia-dev] Re : E17 packaging<br></font><br>Am 23.10.2011 14:18, schrieb Philippe Reynes:<br>&gt; Thanks for this feedback,<br>&gt;<br>&gt; here the new eina.spec with all feedbacks :<br>&gt;<br>&gt;&nbsp; Index: eina/SPECS/eina.spec<br>&gt; ===================================================================<br>&gt; --- eina/SPECS/eina.spec&nbsp; &nbsp; &nbsp; &nbsp; (révision 157379)<br>&gt; +++ eina/SPECS/eina.spec&nbsp; &nbsp; &nbsp; &nbsp; (copie de travail)<br>&gt; @@ -1,18 +1,32 @@<br>&gt;&nbsp; %define major 1<br>&gt;&nbsp; %define libname %mklibname %{name} %major<br>&gt;&nbsp; %define libnamedev %mklibname %{name} -d<br>&gt; +%define svn r64324<br>&gt; +%define rel 1<br>&gt; +%if %svn<br>&gt; +%define release %mkrel -c %svn %rel<br>&gt; +%else<br>&gt;
+ +%define release %mkrel %rel<br>&gt; +%endif<br>&gt;&nbsp; Summary: Data Type Library<br>&gt;&nbsp; Name: eina<br>&gt; -Version: 1.0.1<br>&gt; -Release: %mkrel 2<br>&gt; +Version: 1.1.0<br>&gt; +Release: %{release}<br>&gt;&nbsp; License: LGPLv2+<br>&gt;&nbsp; Group: Graphical desktop/Enlightenment<br>&gt; -Source: <a href="http://download.enlightenment.org/releases/%" target="_blank">http://download.enlightenment.org/releases/%</a>{name}-%{version}.tar.bz2<br>&gt; -URL: <a href="http://www.enlightenment.org/" target="_blank">http://www.enlightenment.org/</a><br>&gt; +# creating archive is quite simple:<br>&gt; +# svn co <a href="http://svn.enlightenment.org/svn/e/trunk/eina" target="_blank">http://svn.enlightenment.org/svn/e/trunk/eina</a> eina<br>&gt; +# tar cJf eina-r&lt;svnrevision&gt;.tar.xz eina<br>&gt; +%if %svn<br>&gt; +Source: %name-%svn.tar.xz<br>&gt; +%else<br>&gt; +Source: <a
+ href="http://download.enlightenment.org/releases/%name-%version.tar.bz2" target="_blank">http://download.enlightenment.org/releases/%name-%version.tar.bz2</a><br>&gt; +%endif<br>&gt; +URL: <a href="http://trac.enlightenment.org/e/wiki/Eina" target="_blank">http://trac.enlightenment.org/e/wiki/Eina</a><br>&gt;&nbsp; %description<br>&gt; -Eina is a data type library.<br>&gt; +Eina is a core data structure and common utility library.<br>&gt;&nbsp; %package -n %libname<br>&gt;&nbsp; Summary: Libraries for the %{name} package<br>&gt; @@ -32,10 +46,17 @@<br>&gt;&nbsp; %{name} development headers and libraries.<br>&gt;&nbsp; %prep<br>&gt; -%setup -qn %{name}-%{version}<br>&gt; +%if %svn<br>&gt; +%setup -qn %name<br>&gt; +%else<br>&gt; +%setup -qn %name-%version<br>&gt; +%endif<br>&gt;&nbsp; %build<br>&gt; -%configure2_5x<br>&gt; +%if %svn<br>&gt; +NOCONFIGURE=1 ./autogen.sh<br>&gt; +%endif<br>&gt; +%configure2_5x --disable-static<br>&gt;&nbsp;
+ %make<br>&gt;&nbsp; %install<br>&gt; @@ -44,18 +65,13 @@<br>&gt;&nbsp; find %buildroot -name *.la | xargs rm<br>&gt; -%clean<br>&gt; -rm -fr %buildroot<br>&gt; -<br>&gt;&nbsp; %files -n %libname<br>&gt; -%defattr(-,root,root)<br>&gt; +%doc AUTHORS README<br>&gt;&nbsp; %{_libdir}/*.so.%{major}*<br>&gt;&nbsp; %files -n %libnamedev<br>&gt; -%defattr(-,root,root)<br>&gt;&nbsp; %{_libdir}/pkgconfig/*<br>&gt;&nbsp; %{_libdir}/*.so<br>&gt; -%{_libdir}/*.a<br>&gt;&nbsp; %{_includedir}/*<br>&gt;<br>&gt; regards,<br>&gt; trem<br>&gt;<br>&gt;<br>&gt; -------------------------------------------------------------------------------<br>&gt; *De :* Florian Hubold &lt;<a ymailto="mailto:doktor5000@arcor.de" href="mailto:doktor5000@arcor.de">doktor5000@arcor.de</a>&gt;<br>&gt; *À :* <a ymailto="mailto:mageia-dev@mageia.org" href="mailto:mageia-dev@mageia.org">mageia-dev@mageia.org</a><br>&gt; *Envoyé le :* Dimanche 23 Octobre 2011 12h55<br>&gt; *Objet :* Re:
+ [Mageia-dev] E17 packaging<br>&gt;<br>&gt; Am 22.10.2011 14:29, schrieb Balcaen John:<br>&gt; &gt; Le samedi 22 octobre 2011 14:10:53 Florian Hubold a écrit :<br>&gt; &gt; [...]<br>&gt; &gt;&gt; Well, there are "stable" snapshots from time to time, but they are<br>&gt; &gt;&gt; not done regularly. I'd say if we can make local builds of a newer SVN<br>&gt; &gt;&gt; snapshot of the whole E17 before Mageia 2 alpha (i.e. in the next ~20 days)<br>&gt; &gt;&gt; then we should at least try it.<br>&gt; &gt;&gt;<br>&gt; &gt;&gt; BTW: I'd remove the Source URL when only using snapshots or<br>&gt; &gt;&gt; change the SPEC in a way that make using SVN snapshots possible<br>&gt; &gt;&gt; by only changing a macro.<br>&gt; &gt; That's was also suggested on irc :)<br>&gt; &gt;<br>&gt; &gt; Regards,<br>&gt; &gt;<br>&gt; So here's my try, feel free to comment:<br>&gt; (Please don't care about the date format for now :) )<br>&gt;<br>&gt;&nbsp; $ svn diff<br>&gt;&nbsp;
+ Index: eina.spec<br>&gt;&nbsp; ===================================================================<br>&gt;&nbsp; --- eina.spec&nbsp; (Revision 157462)<br>&gt;&nbsp; +++ eina.spec&nbsp; (Arbeitskopie)<br>&gt;&nbsp; @@ -1,3 +1,13 @@<br>&gt;&nbsp; +%define svndate 23102011<br>&gt;&nbsp; +<br>&gt;&nbsp; +%define svn r64322<br>&gt;&nbsp; +%if %svn<br>&gt;&nbsp; +%define rel 0.%{svn}svn.1<br>&gt;&nbsp; +%else<br>&gt;&nbsp; +%define rel 1<br>&gt;&nbsp; +%endif<br>&gt;&nbsp; +<br>&gt;&nbsp; +<br>&gt;&nbsp; &nbsp; %define major 1<br>&gt;&nbsp; &nbsp; %define libname %mklibname %{name} %major<br>&gt;&nbsp; &nbsp; %define libnamedev %mklibname %{name} -d<br>&gt;&nbsp; @@ -4,11 +14,18 @@<br>&gt;<br>&gt;&nbsp; &nbsp; Summary: Data Type Library<br>&gt;&nbsp; &nbsp; Name: eina<br>&gt;&nbsp; -Version: 1.0.1<br>&gt;&nbsp; -Release: %mkrel 2<br>&gt;&nbsp; +Version: 1.0.999<br>&gt;&nbsp; +Release: %mkrel %rel<br>&gt;&nbsp; &nbsp; License:
+ LGPLv2+<br>&gt;&nbsp; &nbsp; Group: Graphical desktop/Enlightenment<br>&gt;&nbsp; +# export latest svn checkout<br>&gt;&nbsp; +# svn export <a href="http://svn.enlightenment.org/svn/e/trunk/%" target="_blank">http://svn.enlightenment.org/svn/e/trunk/%</a>{name}<br>&gt;&nbsp; %{name}-svn-$(date +%d%m%Y)<br>&gt;&nbsp; +%if %svn<br>&gt;&nbsp; +Source: %{name}-svn-%svndate.tar.bz2<br>&gt;&nbsp; +%else<br>&gt;&nbsp; &nbsp; Source: <a href="http://download.enlightenment.org/releases/%" target="_blank">http://download.enlightenment.org/releases/%</a>{name}-%{version}.tar.bz2<br>&gt;&nbsp; +%endif<br>&gt;&nbsp; +<br>&gt;&nbsp; &nbsp; URL: <a href="http://www.enlightenment.org/" target="_blank">http://www.enlightenment.org/</a><br>&gt;<br>&gt;&nbsp; &nbsp; %description<br>&gt;&nbsp; @@ -32,9 +49,17 @@<br>&gt;&nbsp; &nbsp; %{name} development headers and libraries.<br>&gt;<br>&gt;&nbsp; &nbsp; %prep<br>&gt;&nbsp; +%if %svn<br>&gt;&nbsp; +%setup
+ -qn %{name}-svn-%svndate<br>&gt;&nbsp; +%else<br>&gt;&nbsp; &nbsp; %setup -qn %{name}-%{version}<br>&gt;&nbsp; +%endif<br>&gt;<br>&gt;&nbsp; +<br>&gt;&nbsp; &nbsp; %build<br>&gt;&nbsp; +%if %svn<br>&gt;&nbsp; +./autogen.sh<br>&gt;&nbsp; +%endif<br>&gt;&nbsp; &nbsp; %configure2_5x<br>&gt;&nbsp; &nbsp; %make<br>&gt;<br>&gt;<br>&gt;<br>Don't do an svn checkout for such purposes, an svn export is much lighter<br>and already excludes all the .svn internal VCS files. Also the version is not <br>correct,<br>eina is not at 1.1.0 as e17 is also not at version 0.17.<br><br><br></div></div></div></body></html> \ No newline at end of file