[Mageia-dev] Re : Re : Re : Re : E17 packaging

[Philippe Reynes]

Hi,

I've updated (yes, yet another time ...) the eina.spec :

Index: eina/SPECS/eina.spec
===================================================================
--- eina/SPECS/eina.spec        (révision 157379)
+++ eina/SPECS/eina.spec        (copie de travail)
@@ -1,18 +1,32 @@
 %define major 1
 %define libname %mklibname %{name} %major
 %define libnamedev %mklibname %{name} -d
+%define svn r64327
+%define rel 1
+%if %svn
+%define release %mkrel -c %svn %rel
+%else
+%define release %mkrel %rel
+%endif
 
 Summary: Data Type Library
 Name: eina
-Version: 1.0.1
-Release: %mkrel 2
+Version: 1.0.999
+Release: %{release}
 License: LGPLv2+
 Group: Graphical desktop/Enlightenment
-Source: http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-URL: http://www.enlightenment.org/
+# creating archive is quite simple:
+# svn export http://svn.enlightenment.org/svn/e/trunk/%name %name
+# tar cJf %name-%svn.tar.xz %name
+%if %svn
+Source: %name-%svn.tar.xz
+%else
+Source: http://download.enlightenment.org/releases/%name-%version.tar.bz2
+%endif
+URL: http://trac.enlightenment.org/e/wiki/Eina


 %description
-Eina is a data type library.
+Eina is a core data structure and common utility library.
 
 %package -n %libname
 Summary: Libraries for the %{name} package
@@ -32,10 +46,17 @@
 %{name} development headers and libraries.
 
 %prep
-%setup -qn %{name}-%{version}
+%if %svn
+%setup -qn %name
+%else
+%setup -qn %name-%version
+%endif
 
 %build
-%configure2_5x
+%if %svn
+NOCONFIGURE=1 ./autogen.sh
+%endif
+%configure2_5x --disable-static
 %make
 
 %install
@@ -44,18 +65,13 @@
 
 find %buildroot -name *.la | xargs rm
 
-%clean
-rm -fr %buildroot
-
 %files -n %libname
-%defattr(-,root,root)
+%doc AUTHORS README
 %{_libdir}/*.so.%{major}*
 
 %files -n %libnamedev
-%defattr(-,root,root)
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%{_libdir}/*.a
 %{_includedir}/*
 
 
This version is better ?
I can commit ?

regards,
trem


________________________________
De : Philippe Reynes <tremyfr at yahoo.fr>
À : Mageia development mailing-list <mageia-dev at mageia.org>
Envoyé le : Dimanche 23 Octobre 2011 16h22
Objet : [Mageia-dev] Re :  Re :  Re :  E17 packaging


Hi,

You're right, the package version isn't very good.
I've looked in the file configure.ac, and there is a 
version: 1.0.999

When in svn mode, I propose to use the version
indicated in configure.ac. Do you agree ?

About svn export, I'll try if the compilation works
fine with it. If yes, you're right again, it's far better
to use it.

regards,
trem



________________________________
De : Florian Hubold <doktor5000 at arcor.de>
À : Mageia development mailing-list <mageia-dev at mageia.org>
Envoyé le : Dimanche 23 Octobre 2011 16h02
Objet : Re: [Mageia-dev] Re :  Re :  E17 packaging

Am 23.10.2011 14:47, schrieb Philippe Reynes:
>
> In fact, autogen.sh use svnversion to generate some files.
> So, if I only do an svn export, the compilation fails.
>
> I've used eina 1.1.0, because, it should be the next release.
> But I could use another "version", if people prefers.
No, tarballs generated by svn export allow for normal compilation.
Just tested for most of the EFL with a current tarball.

And as we are using the real version for e
 package itself, i'd prefer
to use the same versioning scheme throughout all of EFL.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-dev/attachments/20111023/11f464b9/attachment.html>