4:30 p.m.
On Tuesday, 07 April 2009 at 08:38, Adrian Reber wrote:
Author: adrian
Update of /cvs/free/rpms/mpg321/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10712
Modified Files:
.cvsignore mpg321.spec sources
The diff of this commit is hardly readable. You should've split
the cosmetic (whitespace) changes and functional changes into
separate commits. I have asked for this on the developers' list
a number of times.
Index: mpg321.spec
===================================================================
RCS file: /cvs/free/rpms/mpg321/devel/mpg321.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpg321.spec 29 Mar 2009 13:49:24 -0000 1.3
+++ mpg321.spec 7 Apr 2009 06:38:40 -0000 1.4
@@ -1,74 +1,103 @@
[...]
+# alternatives priority
+%define apriority 50
+# prepare ghost alternatives
+%{__ln_s} -f %{name} %{buildroot}%{_bindir}/mpg123
+%{__ln_s} -f %{name} %{buildroot}%{_bindir}/mp3-cmdline
+%{__ln_s} -f %{name}.1 %{buildroot}%{_mandir}/man1/mpg123.1
These symlinks are maintained by alternatives, so there's no need
to create them explicitly. A simple touch will do.
%clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
%post
-/usr/sbin/update-alternatives --install %{_bindir}/mp3-cmdline \
- mp3-cmdline %{_bindir}/mpg321 40
Shouldn't it be %{apriority} instead of 40 here?
@@ -92,6 +121,21 @@
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
+* Sun Sep 04 2005 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-6.2
+- Spec update.
+
+* Wed Jul 20 2005 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-6.1
+- update.
+
+* Mon Jul 4 2005 Matthias Saou <http://freshrpms.net/> 0.2.10-6
+- Include printf patch to fix CAN-2003-0969 (Jens Koerber).
+
+* Mon Jan 31 2005 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-5.1
+- fc3 build.
+
+* Sun Sep 05 2004 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-5.1
+- fc2 build.
+
* Fri Jan 9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.2.10.3-0.lvn.1
- Update to 0.2.10.3 (from Debian), fixes CAN-2003-0969.
- Make alsa09 the default output device.
Why are you adding old entries in the %changelog?
Regards,
R.
--
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
-- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
8:05 a.m.
New subject: rpms/mpg321/devel .cvsignore, 1.2, 1.3 mpg321.spec, 1.3, 1.4 sources, 1.2, 1.3
On Tue, Apr 07, 2009 at 06:30:34PM +0200, Dominik 'Rathann' Mierzejewski wrote:
On Tuesday, 07 April 2009 at 08:38, Adrian Reber wrote:
> Author: adrian
>
> Update of /cvs/free/rpms/mpg321/devel
> In directory se02.es.rpmfusion.net:/tmp/cvs-serv10712
>
> Modified Files:
> .cvsignore mpg321.spec sources
The diff of this commit is hardly readable. You should've split
the cosmetic (whitespace) changes and functional changes into
separate commits. I have asked for this on the developers' list
a number of times.
You are right and I would have normally done it, but I tried to adapt
the changes from the new spec file from the bugreport to the file in CVS
and it still had so many changes that I saw no real benefit to do two
commits. I was happy enough that somebody cared about mpg321.spec that
I thought I rather use his spec file (which seems to be maintained) than
the one not really maintained by myself.
> Index: mpg321.spec
> ===================================================================
> RCS file: /cvs/free/rpms/mpg321/devel/mpg321.spec,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- mpg321.spec 29 Mar 2009 13:49:24 -0000 1.3
> +++ mpg321.spec 7 Apr 2009 06:38:40 -0000 1.4
> @@ -1,74 +1,103 @@
[...]
> +# alternatives priority
> +%define apriority 50
> +# prepare ghost alternatives
> +%{__ln_s} -f %{name} %{buildroot}%{_bindir}/mpg123
> +%{__ln_s} -f %{name} %{buildroot}%{_bindir}/mp3-cmdline
> +%{__ln_s} -f %{name}.1 %{buildroot}%{_mandir}/man1/mpg123.1
These symlinks are maintained by alternatives, so there's no need
to create them explicitly. A simple touch will do.
I will look into that.
> %clean
> -rm -rf $RPM_BUILD_ROOT
> -
> +%{__rm} -rf %{buildroot}
>
> %post
> -/usr/sbin/update-alternatives --install %{_bindir}/mp3-cmdline \
> - mp3-cmdline %{_bindir}/mpg321 40
Shouldn't it be %{apriority} instead of 40 here?
Sounds like you are right. Will fix it.
> @@ -92,6 +121,21 @@
> * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
> - add dist
>
> +* Sun Sep 04 2005 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-6.2
> +- Spec update.
> +
> +* Wed Jul 20 2005 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-6.1
> +- update.
> +
> +* Mon Jul 4 2005 Matthias Saou <http://freshrpms.net/> 0.2.10-6
> +- Include printf patch to fix CAN-2003-0969 (Jens Koerber).
> +
> +* Mon Jan 31 2005 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-5.1
> +- fc3 build.
> +
> +* Sun Sep 05 2004 Luboš Staněk <stanekl(a)atlas.cz> - 0.2.10-5.1
> +- fc2 build.
> +
> * Fri Jan 9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.2.10.3-0.lvn.1
> - Update to 0.2.10.3 (from Debian), fixes CAN-2003-0969.
> - Make alsa09 the default output device.
Why are you adding old entries in the %changelog?
At one point I just copied the whole spec file from Luboš instead
of cherry picking almost everything.
Adrian
5497
days inactive
5498
days old
rpmfusion-developers@lists.rpmfusion.org
1 comments
2 participants
participants (2)
-
Adrian Reber -
Dominik 'Rathann' Mierzejewski