diff options
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html')
-rw-r--r-- | zarb-ml/mageia-dev/attachments/20111023/1114cdac/attachment.html | 9 |
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 :</span></b> Florian Hubold <doktor5000@arcor.de><br><b><span style="font-weight: bold;">À :</span></b> Mageia development mailing-list + <mageia-dev@mageia.org><br><b><span style="font-weight: bold;">Envoyé le :</span></b> Dimanche 23 Octobre 2011 14h31<br><b><span style="font-weight: bold;">Objet :</span></b> Re: [Mageia-dev] Re : E17 packaging<br></font><br>Am 23.10.2011 14:18, schrieb Philippe Reynes:<br>> Thanks for this feedback,<br>><br>> here the new eina.spec with all feedbacks :<br>><br>> Index: eina/SPECS/eina.spec<br>> ===================================================================<br>> --- eina/SPECS/eina.spec (révision 157379)<br>> +++ eina/SPECS/eina.spec (copie de travail)<br>> @@ -1,18 +1,32 @@<br>> %define major 1<br>> %define libname %mklibname %{name} %major<br>> %define libnamedev %mklibname %{name} -d<br>> +%define svn r64324<br>> +%define rel 1<br>> +%if %svn<br>> +%define release %mkrel -c %svn %rel<br>> +%else<br>> + +%define release %mkrel %rel<br>> +%endif<br>> Summary: Data Type Library<br>> Name: eina<br>> -Version: 1.0.1<br>> -Release: %mkrel 2<br>> +Version: 1.1.0<br>> +Release: %{release}<br>> License: LGPLv2+<br>> Group: Graphical desktop/Enlightenment<br>> -Source: <a href="http://download.enlightenment.org/releases/%" target="_blank">http://download.enlightenment.org/releases/%</a>{name}-%{version}.tar.bz2<br>> -URL: <a href="http://www.enlightenment.org/" target="_blank">http://www.enlightenment.org/</a><br>> +# creating archive is quite simple:<br>> +# 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>> +# tar cJf eina-r<svnrevision>.tar.xz eina<br>> +%if %svn<br>> +Source: %name-%svn.tar.xz<br>> +%else<br>> +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>> +%endif<br>> +URL: <a href="http://trac.enlightenment.org/e/wiki/Eina" target="_blank">http://trac.enlightenment.org/e/wiki/Eina</a><br>> %description<br>> -Eina is a data type library.<br>> +Eina is a core data structure and common utility library.<br>> %package -n %libname<br>> Summary: Libraries for the %{name} package<br>> @@ -32,10 +46,17 @@<br>> %{name} development headers and libraries.<br>> %prep<br>> -%setup -qn %{name}-%{version}<br>> +%if %svn<br>> +%setup -qn %name<br>> +%else<br>> +%setup -qn %name-%version<br>> +%endif<br>> %build<br>> -%configure2_5x<br>> +%if %svn<br>> +NOCONFIGURE=1 ./autogen.sh<br>> +%endif<br>> +%configure2_5x --disable-static<br>> + %make<br>> %install<br>> @@ -44,18 +65,13 @@<br>> find %buildroot -name *.la | xargs rm<br>> -%clean<br>> -rm -fr %buildroot<br>> -<br>> %files -n %libname<br>> -%defattr(-,root,root)<br>> +%doc AUTHORS README<br>> %{_libdir}/*.so.%{major}*<br>> %files -n %libnamedev<br>> -%defattr(-,root,root)<br>> %{_libdir}/pkgconfig/*<br>> %{_libdir}/*.so<br>> -%{_libdir}/*.a<br>> %{_includedir}/*<br>><br>> regards,<br>> trem<br>><br>><br>> -------------------------------------------------------------------------------<br>> *De :* Florian Hubold <<a ymailto="mailto:doktor5000@arcor.de" href="mailto:doktor5000@arcor.de">doktor5000@arcor.de</a>><br>> *À :* <a ymailto="mailto:mageia-dev@mageia.org" href="mailto:mageia-dev@mageia.org">mageia-dev@mageia.org</a><br>> *Envoyé le :* Dimanche 23 Octobre 2011 12h55<br>> *Objet :* Re: + [Mageia-dev] E17 packaging<br>><br>> Am 22.10.2011 14:29, schrieb Balcaen John:<br>> > Le samedi 22 octobre 2011 14:10:53 Florian Hubold a écrit :<br>> > [...]<br>> >> Well, there are "stable" snapshots from time to time, but they are<br>> >> not done regularly. I'd say if we can make local builds of a newer SVN<br>> >> snapshot of the whole E17 before Mageia 2 alpha (i.e. in the next ~20 days)<br>> >> then we should at least try it.<br>> >><br>> >> BTW: I'd remove the Source URL when only using snapshots or<br>> >> change the SPEC in a way that make using SVN snapshots possible<br>> >> by only changing a macro.<br>> > That's was also suggested on irc :)<br>> ><br>> > Regards,<br>> ><br>> So here's my try, feel free to comment:<br>> (Please don't care about the date format for now :) )<br>><br>> $ svn diff<br>> + Index: eina.spec<br>> ===================================================================<br>> --- eina.spec (Revision 157462)<br>> +++ eina.spec (Arbeitskopie)<br>> @@ -1,3 +1,13 @@<br>> +%define svndate 23102011<br>> +<br>> +%define svn r64322<br>> +%if %svn<br>> +%define rel 0.%{svn}svn.1<br>> +%else<br>> +%define rel 1<br>> +%endif<br>> +<br>> +<br>> %define major 1<br>> %define libname %mklibname %{name} %major<br>> %define libnamedev %mklibname %{name} -d<br>> @@ -4,11 +14,18 @@<br>><br>> Summary: Data Type Library<br>> Name: eina<br>> -Version: 1.0.1<br>> -Release: %mkrel 2<br>> +Version: 1.0.999<br>> +Release: %mkrel %rel<br>> License: + LGPLv2+<br>> Group: Graphical desktop/Enlightenment<br>> +# export latest svn checkout<br>> +# svn export <a href="http://svn.enlightenment.org/svn/e/trunk/%" target="_blank">http://svn.enlightenment.org/svn/e/trunk/%</a>{name}<br>> %{name}-svn-$(date +%d%m%Y)<br>> +%if %svn<br>> +Source: %{name}-svn-%svndate.tar.bz2<br>> +%else<br>> Source: <a href="http://download.enlightenment.org/releases/%" target="_blank">http://download.enlightenment.org/releases/%</a>{name}-%{version}.tar.bz2<br>> +%endif<br>> +<br>> URL: <a href="http://www.enlightenment.org/" target="_blank">http://www.enlightenment.org/</a><br>><br>> %description<br>> @@ -32,9 +49,17 @@<br>> %{name} development headers and libraries.<br>><br>> %prep<br>> +%if %svn<br>> +%setup + -qn %{name}-svn-%svndate<br>> +%else<br>> %setup -qn %{name}-%{version}<br>> +%endif<br>><br>> +<br>> %build<br>> +%if %svn<br>> +./autogen.sh<br>> +%endif<br>> %configure2_5x<br>> %make<br>><br>><br>><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 |