Re: [Mageia-dev] Re : E17 packaging

2011-10-31 Thread Michael Scherer 
Le samedi 29 octobre 2011 à 18:38 +0100, Philippe Reynes a écrit :
 Hi all,
 
 
 Another solution is to package e17 twice (like chromium):
 - an E17 -stable based stable tarball, as it was almost/already done
 - an E17-unstable based on svn, as it's done now

I am a little bit stupid, but can you explain how it solve the issue of
not bypassing our update policy ?

-- 
Michael Scherer

[Mageia-dev] Re : E17 packaging

2011-10-29 Thread Philippe Reynes 
Hi all,

Another solution is to package e17 twice (like chromium):
- an E17 -stable based stable tarball, as it was almost/already done
- an E17-unstable based on svn, as it's done now

regards,
trem

[Mageia-dev] Re : E17 packaging

2011-10-23 Thread Philippe Reynes 
Thanks for this feedback,

here the new eina.spec with all feedbacks :

 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 r64324
+%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.1.0
+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 co http://svn.enlightenment.org/svn/e/trunk/eina eina
+# tar cJf eina-rsvnrevision.tar.xz eina
+%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}/*
 
 

regards,
trem




De : Florian Hubold doktor5...@arcor.de
À : mageia-dev@mageia.org
Envoyé le : Dimanche 23 Octobre 2011 12h55
Objet : Re: [Mageia-dev] E17 packaging

Am 22.10.2011 14:29, schrieb Balcaen John:
 Le samedi 22 octobre 2011 14:10:53 Florian Hubold a écrit :
 [...]
 Well, there are stable snapshots from time to time, but they are
 not done regularly. I'd say if we can make local builds of a newer SVN
 snapshot of the whole E17 before Mageia 2 alpha (i.e. in the next ~20 days)
 then we should at least try it.
 
 BTW: I'd remove the Source URL when only using snapshots or
 change the SPEC in a way that make using SVN snapshots possible
 by only changing a macro.
 That's was also suggested on irc :)
 
 Regards,
 
So here's my try, feel free to comment:
(Please don't care about the date format for now :) )

   $ svn diff
   Index: eina.spec
   ===
   --- eina.spec   (Revision 157462)
   +++ eina.spec   (Arbeitskopie)
   @@ -1,3 +1,13 @@
   +%define svndate 23102011
   +
   +%define svn r64322
   +%if %svn
   +%define rel 0.%{svn}svn.1
   +%else
   +%define rel 1
   +%endif
   +
   +
     %define major 1
     %define libname %mklibname %{name} %major
     %define libnamedev %mklibname %{name} -d
   @@ -4,11 +14,18 @@

     Summary: Data Type Library
     Name: eina
   -Version: 1.0.1
   -Release: %mkrel 2
   +Version: 1.0.999
   +Release: %mkrel %rel
     License: LGPLv2+
     Group: Graphical desktop/Enlightenment
   +# export latest svn checkout
   +# svn export http://svn.enlightenment.org/svn/e/trunk/%{name}
   %{name}-svn-$(date +%d%m%Y)
   +%if %svn
   +Source: %{name}-svn-%svndate.tar.bz2
   +%else
     Source: 
http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
   +%endif
   +
     URL: http://www.enlightenment.org/

     %description
   @@ -32,9 +49,17 @@
     %{name} development headers and libraries.

     %prep
   +%if %svn
   +%setup -qn %{name}-svn-%svndate
   +%else
     %setup -qn %{name}-%{version}
   +%endif

   +
     %build
   +%if %svn
   +./autogen.sh
   +%endif
     %configure2_5x
     %make

Re: [Mageia-dev] Re : E17 packaging

2011-10-23 Thread Florian Hubold 

Am 23.10.2011 14:18, schrieb Philippe Reynes:

Thanks for this feedback,

here the new eina.spec with all feedbacks :

 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 r64324
+%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.1.0
+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 co http://svn.enlightenment.org/svn/e/trunk/eina eina
+# tar cJf eina-rsvnrevision.tar.xz eina
+%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}/*

regards,
trem


---
*De :* Florian Hubold doktor5...@arcor.de
*À :* mageia-dev@mageia.org
*Envoyé le :* Dimanche 23 Octobre 2011 12h55
*Objet :* Re: [Mageia-dev] E17 packaging

Am 22.10.2011 14:29, schrieb Balcaen John:
 Le samedi 22 octobre 2011 14:10:53 Florian Hubold a écrit :
 [...]
 Well, there are stable snapshots from time to time, but they are
 not done regularly. I'd say if we can make local builds of a newer SVN
 snapshot of the whole E17 before Mageia 2 alpha (i.e. in the next ~20 days)
 then we should at least try it.

 BTW: I'd remove the Source URL when only using snapshots or
 change the SPEC in a way that make using SVN snapshots possible
 by only changing a macro.
 That's was also suggested on irc :)

 Regards,

So here's my try, feel free to comment:
(Please don't care about the date format for now :) )

  $ svn diff
  Index: eina.spec
  ===
  --- eina.spec  (Revision 157462)
  +++ eina.spec  (Arbeitskopie)
  @@ -1,3 +1,13 @@
  +%define svndate 23102011
  +
  +%define svn r64322
  +%if %svn
  +%define rel 0.%{svn}svn.1
  +%else
  +%define rel 1
  +%endif
  +
  +
%define major 1
%define libname %mklibname %{name} %major
%define libnamedev %mklibname %{name} -d
  @@ -4,11 +14,18 @@

Summary: Data Type Library
Name: eina
  -Version: 1.0.1
  -Release: %mkrel 2
  +Version: 1.0.999
  +Release: %mkrel %rel
License: LGPLv2+
Group: Graphical desktop/Enlightenment
  +# export latest svn checkout
  +# svn export http://svn.enlightenment.org/svn/e/trunk/%{name}
  %{name}-svn-$(date +%d%m%Y)
  +%if %svn
  +Source: %{name}-svn-%svndate.tar.bz2
  +%else
Source: 
http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
  +%endif
  +
URL: http://www.enlightenment.org/

%description
  @@ -32,9 +49,17 @@
%{name} development headers and libraries.

%prep
  +%if %svn
  +%setup -qn %{name}-svn-%svndate
  +%else
%setup -qn %{name}-%{version}
  +%endif

  +
%build
  +%if %svn
  +./autogen.sh
  +%endif
%configure2_5x
%make




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.