rpms/autopano-sift-C/F-9 autopano-sift-C.README.fedora, NONE, 1.1 autopano-sift-C.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/autopano-sift-C/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4103
Modified Files:
.cvsignore sources
Added Files:
autopano-sift-C.README.fedora autopano-sift-C.spec
Log Message:
initial import from livna
--- NEW FILE autopano-sift-C.README.fedora ---
To use with hugin, set the 'Autopano-SIFT:' preference to:
autopano-c-complete.sh
..and the 'Arguments:' preference to:
--output %o --points %p %i
--- NEW FILE autopano-sift-C.spec ---
Summary: SIFT feature detection
Name: autopano-sift-C
Version: 2.4.1
Release: 0.2.20080220svn%{?dist}
License: GPLv2
Group: Applications/Multimedia
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# svn export -r 2904 https://hugin.svn.sourceforge.net/svnroot/hugin/autopano-sift-C/trunk autopano-sift-C
# cd autopano-sift-C
# cmake . && make package_source
Source: %{name}-%{version}.tar.gz
Source1: autopano-sift-C.README.fedora
URL: http://hugin.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpano13-devel libxml2-devel cmake
%description
This package provides an implementation of the SIFT algorithm and a set of
utilities to utilize the algorithm to match two or more images. The output is
created as project file for the hugin panorama stitching software.
%prep
%setup -q
%build
cp -a %{SOURCE1} README.fedora
%cmake .
make VERBOSE=1 %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc README LICENSE README.1ST README.fedora
%{_bindir}/autopano
%{_bindir}/autopano-sift-c
%{_bindir}/generatekeys
%{_bindir}/autopano-c-complete.sh
%{_mandir}/man1/autopano.1.gz
%{_mandir}/man1/generatekeys.1.gz
%{_mandir}/man1/autopano-c-complete.1.gz
%{_mandir}/man7/autopano-sift-c.7.gz
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.4.1-0.2.20080220svn
- rebuild
* Wed Feb 20 2008 Bruno Postle <bruno(a)postle.net> 2.4.1-0.1.20080220svn
- update from SVN, 2.4.1 pre-release
- new cmake build system, new tool autopano-sift-c
* Sat Jan 19 2008 Bruno Postle <bruno(a)postle.net> 2.4-5.20080102svn
- put README.fedora on SOURCES, change post-release versioning slightly
* Mon Jan 14 2008 Bruno Postle <bruno(a)postle.net> 2.4-4.1.20080102svn
- update with review fixes
* Wed Jan 02 2008 Bruno Postle <bruno(a)postle.net> 2.4-4svn20080102
- update from SVN Revision: 2597
- switch pano12 dependency to pano13
* Thu Nov 15 2007 Bruno Postle <bruno(a)postle.net> 2.4-3
- fix license tag
- bugfix from http://sourceforge.net/tracker/index.php?func=detail&aid=1808333&group_id...
* Mon Jul 02 2007 Bruno Postle <bruno(a)postle.net> 2.4-2
- add autopano-c-complete.sh
* Tue Feb 19 2007 Bruno Postle <bruno(a)postle.net> 2.4-1
- initial rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/autopano-sift-C/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:48:06 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:35:07 -0000 1.2
@@ -0,0 +1 @@
+autopano-sift-C-2.4.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/autopano-sift-C/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:48:06 -0000 1.1
+++ sources 3 Aug 2008 17:35:07 -0000 1.2
@@ -0,0 +1 @@
+41d00c89fc8b5e2c940eb3fe14c43db6 autopano-sift-C-2.4.1.tar.gz
16 years, 3 months
- 1
- 0
rpms/libdca/F-8 libdca-0.0.5-relsymlinks.patch, NONE, 1.1 libdca-0.0.5-strict-aliasing.patch, NONE, 1.1 libdca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/libdca/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3698
Modified Files:
.cvsignore sources
Added Files:
libdca-0.0.5-relsymlinks.patch
libdca-0.0.5-strict-aliasing.patch libdca.spec
Log Message:
initial import from livna
libdca-0.0.5-relsymlinks.patch:
--- NEW FILE libdca-0.0.5-relsymlinks.patch ---
diff -Naupr libdca-0.0.5.orig/libdca/Makefile.am libdca-0.0.5/libdca/Makefile.am
--- libdca-0.0.5/libdca/Makefile.am 2007-04-08 10:32:01.000000000 +0200
+++ libdca-0.0.5/libdca/Makefile.am 2007-04-08 10:32:01.000000000 +0200
@@ -14,7 +14,7 @@ pkgconfig_DATA = libdca.pc libdts.pc
EXTRA_DIST = configure.incl
install-exec-hook:
- ln -sf "$(libdir)/libdca.a" "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && ln -sf "libdca.a" "$(DESTDIR)$(libdir)/libdts.a" || true
uninstall-hook:
- unlink "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && unlink "$(DESTDIR)$(libdir)/libdts.a" || true
diff -Naupr libdca-0.0.5.orig/libdca/Makefile.in libdca-0.0.5/libdca/Makefile.in
--- libdca-0.0.5/libdca/Makefile.in 2007-04-10 14:31:23.000000000 +0200
+++ libdca-0.0.5/libdca/Makefile.in 2007-04-10 14:31:23.000000000 +0200
@@ -504,10 +504,10 @@ uninstall-am: uninstall-libLTLIBRARIES u
install-exec-hook:
- ln -sf "$(libdir)/libdca.a" "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && ln -sf "libdca.a" "$(DESTDIR)$(libdir)/libdts.a" || true
uninstall-hook:
- unlink "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && unlink "$(DESTDIR)$(libdir)/libdts.a" || true
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naupr libdca-0.0.5.orig/src/Makefile.am libdca-0.0.5/src/Makefile.am
--- libdca-0.0.5/src/Makefile.am 2007-04-08 10:21:18.000000000 +0200
+++ libdca-0.0.5/src/Makefile.am 2007-04-08 10:21:18.000000000 +0200
@@ -24,7 +24,7 @@ install-data-hook:
for a in dcadec extract_dca; do \
oldname=`echo "$$a" | sed -e 's/ca/ts/' | sed '$(transform)'` ; \
name=`echo "$$a" | sed '$(transform)'` ; \
- ln -sf "$(man1dir)/$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
+ ln -sf "$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
done
uninstall-hook:
diff -Naupr libdca-0.0.5.orig/src/Makefile.in libdca-0.0.5/src/Makefile.in
--- libdca-0.0.5/src/Makefile.in 2007-04-10 14:31:23.000000000 +0200
+++ libdca-0.0.5/src/Makefile.in 2007-04-10 14:31:23.000000000 +0200
@@ -562,7 +562,7 @@ install-data-hook:
for a in dcadec extract_dca; do \
oldname=`echo "$$a" | sed -e 's/ca/ts/' | sed '$(transform)'` ; \
name=`echo "$$a" | sed '$(transform)'` ; \
- ln -sf "$(man1dir)/$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
+ ln -sf "$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
done
uninstall-hook:
libdca-0.0.5-strict-aliasing.patch:
--- NEW FILE libdca-0.0.5-strict-aliasing.patch ---
diff -up libdca-0.0.5/libao/Makefile.in.aliasing libdca-0.0.5/libao/Makefile.in
--- libdca-0.0.5/libao/Makefile.in.aliasing 2007-11-02 21:16:15.000000000 +0100
+++ libdca-0.0.5/libao/Makefile.in 2007-11-02 21:16:46.000000000 +0100
@@ -172,7 +172,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(OPT_CFLAGS)
+AM_CFLAGS = $(OPT_CFLAGS) -fno-strict-aliasing
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libao.la
libao_la_SOURCES = audio_out.c audio_out_null.c audio_out_float.c \
diff -up libdca-0.0.5/libao/Makefile.am.aliasing libdca-0.0.5/libao/Makefile.am
--- libdca-0.0.5/libao/Makefile.am.aliasing 2007-04-08 10:23:11.000000000 +0200
+++ libdca-0.0.5/libao/Makefile.am 2007-11-02 21:16:08.000000000 +0100
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(OPT_CFLAGS)
+AM_CFLAGS = $(OPT_CFLAGS) -fno-strict-aliasing
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libao.la
diff -up libdca-0.0.5/libdca/bitstream.h.aliasing libdca-0.0.5/libdca/bitstream.h
--- libdca-0.0.5/libdca/bitstream.h.aliasing 2007-04-08 11:08:35.000000000 +0200
+++ libdca-0.0.5/libdca/bitstream.h 2007-11-02 21:20:07.000000000 +0100
@@ -29,22 +29,38 @@
#else
-# define swab32(x)\
-((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | \
- (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]))
+static inline uint32_t swab32(uint32_t x) {
+ union {
+ uint32_t x32;
+ uint8_t x8[4];
+ } u;
+ u.x32 = x;
+ return u.x8[0] << 24 | u.x8[1] << 16 | u.x8[2] << 8 | u.x8[3];
+}
#endif
#ifdef WORDS_BIGENDIAN
-# define swable32(x)\
-((((uint8_t*)&x)[0] << 16) | (((uint8_t*)&x)[1] << 24) | \
- (((uint8_t*)&x)[2]) | (((uint8_t*)&x)[3] << 8))
+static inline uint32_t swable32(uint32_t x) {
+ union {
+ uint32_t x32;
+ uint8_t x8[4];
+ } u;
+ u.x32 = x;
+ return u.x8[0] << 16 | u.x8[1] << 24 | u.x8[2] | u.x8[3] << 8;
+}
#else
-# define swable32(x)\
-((((uint32_t)x) >> 16) | (((uint32_t)x) << 16))
+static inline uint32_t swable32(uint32_t x) {
+ union {
+ uint32_t x32;
+ uint16_t x16[2];
+ } u;
+ u.x32 = x;
+ return u.x16[0] << 16 | u.x16[1];
+}
#endif
***** Error reading new file: [Errno 2] No such file or directory: 'libdca.spec'
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libdca/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:52:34 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:34:15 -0000 1.2
@@ -0,0 +1 @@
+libdca-0.0.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libdca/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:52:34 -0000 1.1
+++ sources 3 Aug 2008 17:34:15 -0000 1.2
@@ -0,0 +1 @@
+dab6b2795c66a82a6fcd4f8343343021 libdca-0.0.5.tar.bz2
16 years, 3 months
- 1
- 0
rpms/libdca/F-9 libdca-0.0.5-relsymlinks.patch, NONE, 1.1 libdca-0.0.5-strict-aliasing.patch, NONE, 1.1 libdca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/libdca/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3572
Modified Files:
.cvsignore sources
Added Files:
libdca-0.0.5-relsymlinks.patch
libdca-0.0.5-strict-aliasing.patch libdca.spec
Log Message:
initial import from livna
libdca-0.0.5-relsymlinks.patch:
--- NEW FILE libdca-0.0.5-relsymlinks.patch ---
diff -Naupr libdca-0.0.5.orig/libdca/Makefile.am libdca-0.0.5/libdca/Makefile.am
--- libdca-0.0.5/libdca/Makefile.am 2007-04-08 10:32:01.000000000 +0200
+++ libdca-0.0.5/libdca/Makefile.am 2007-04-08 10:32:01.000000000 +0200
@@ -14,7 +14,7 @@ pkgconfig_DATA = libdca.pc libdts.pc
EXTRA_DIST = configure.incl
install-exec-hook:
- ln -sf "$(libdir)/libdca.a" "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && ln -sf "libdca.a" "$(DESTDIR)$(libdir)/libdts.a" || true
uninstall-hook:
- unlink "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && unlink "$(DESTDIR)$(libdir)/libdts.a" || true
diff -Naupr libdca-0.0.5.orig/libdca/Makefile.in libdca-0.0.5/libdca/Makefile.in
--- libdca-0.0.5/libdca/Makefile.in 2007-04-10 14:31:23.000000000 +0200
+++ libdca-0.0.5/libdca/Makefile.in 2007-04-10 14:31:23.000000000 +0200
@@ -504,10 +504,10 @@ uninstall-am: uninstall-libLTLIBRARIES u
install-exec-hook:
- ln -sf "$(libdir)/libdca.a" "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && ln -sf "libdca.a" "$(DESTDIR)$(libdir)/libdts.a" || true
uninstall-hook:
- unlink "$(DESTDIR)$(libdir)/libdts.a"
+ [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && unlink "$(DESTDIR)$(libdir)/libdts.a" || true
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -Naupr libdca-0.0.5.orig/src/Makefile.am libdca-0.0.5/src/Makefile.am
--- libdca-0.0.5/src/Makefile.am 2007-04-08 10:21:18.000000000 +0200
+++ libdca-0.0.5/src/Makefile.am 2007-04-08 10:21:18.000000000 +0200
@@ -24,7 +24,7 @@ install-data-hook:
for a in dcadec extract_dca; do \
oldname=`echo "$$a" | sed -e 's/ca/ts/' | sed '$(transform)'` ; \
name=`echo "$$a" | sed '$(transform)'` ; \
- ln -sf "$(man1dir)/$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
+ ln -sf "$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
done
uninstall-hook:
diff -Naupr libdca-0.0.5.orig/src/Makefile.in libdca-0.0.5/src/Makefile.in
--- libdca-0.0.5/src/Makefile.in 2007-04-10 14:31:23.000000000 +0200
+++ libdca-0.0.5/src/Makefile.in 2007-04-10 14:31:23.000000000 +0200
@@ -562,7 +562,7 @@ install-data-hook:
for a in dcadec extract_dca; do \
oldname=`echo "$$a" | sed -e 's/ca/ts/' | sed '$(transform)'` ; \
name=`echo "$$a" | sed '$(transform)'` ; \
- ln -sf "$(man1dir)/$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
+ ln -sf "$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \
done
uninstall-hook:
libdca-0.0.5-strict-aliasing.patch:
--- NEW FILE libdca-0.0.5-strict-aliasing.patch ---
diff -up libdca-0.0.5/libao/Makefile.in.aliasing libdca-0.0.5/libao/Makefile.in
--- libdca-0.0.5/libao/Makefile.in.aliasing 2007-11-02 21:16:15.000000000 +0100
+++ libdca-0.0.5/libao/Makefile.in 2007-11-02 21:16:46.000000000 +0100
@@ -172,7 +172,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(OPT_CFLAGS)
+AM_CFLAGS = $(OPT_CFLAGS) -fno-strict-aliasing
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libao.la
libao_la_SOURCES = audio_out.c audio_out_null.c audio_out_float.c \
diff -up libdca-0.0.5/libao/Makefile.am.aliasing libdca-0.0.5/libao/Makefile.am
--- libdca-0.0.5/libao/Makefile.am.aliasing 2007-04-08 10:23:11.000000000 +0200
+++ libdca-0.0.5/libao/Makefile.am 2007-11-02 21:16:08.000000000 +0100
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(OPT_CFLAGS)
+AM_CFLAGS = $(OPT_CFLAGS) -fno-strict-aliasing
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libao.la
diff -up libdca-0.0.5/libdca/bitstream.h.aliasing libdca-0.0.5/libdca/bitstream.h
--- libdca-0.0.5/libdca/bitstream.h.aliasing 2007-04-08 11:08:35.000000000 +0200
+++ libdca-0.0.5/libdca/bitstream.h 2007-11-02 21:20:07.000000000 +0100
@@ -29,22 +29,38 @@
#else
-# define swab32(x)\
-((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | \
- (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]))
+static inline uint32_t swab32(uint32_t x) {
+ union {
+ uint32_t x32;
+ uint8_t x8[4];
+ } u;
+ u.x32 = x;
+ return u.x8[0] << 24 | u.x8[1] << 16 | u.x8[2] << 8 | u.x8[3];
+}
#endif
#ifdef WORDS_BIGENDIAN
-# define swable32(x)\
-((((uint8_t*)&x)[0] << 16) | (((uint8_t*)&x)[1] << 24) | \
- (((uint8_t*)&x)[2]) | (((uint8_t*)&x)[3] << 8))
+static inline uint32_t swable32(uint32_t x) {
+ union {
+ uint32_t x32;
+ uint8_t x8[4];
+ } u;
+ u.x32 = x;
+ return u.x8[0] << 16 | u.x8[1] << 24 | u.x8[2] | u.x8[3] << 8;
+}
#else
-# define swable32(x)\
-((((uint32_t)x) >> 16) | (((uint32_t)x) << 16))
+static inline uint32_t swable32(uint32_t x) {
+ union {
+ uint32_t x32;
+ uint16_t x16[2];
+ } u;
+ u.x32 = x;
+ return u.x16[0] << 16 | u.x16[1];
+}
#endif
***** Error reading new file: [Errno 2] No such file or directory: 'libdca.spec'
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libdca/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:52:34 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:34:00 -0000 1.2
@@ -0,0 +1 @@
+libdca-0.0.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libdca/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:52:34 -0000 1.1
+++ sources 3 Aug 2008 17:34:00 -0000 1.2
@@ -0,0 +1 @@
+dab6b2795c66a82a6fcd4f8343343021 libdca-0.0.5.tar.bz2
16 years, 3 months
- 1
- 0
rpms/lame/F-8 lame-as-needed.patch, NONE, 1.1 lame-noexecstack.patch, NONE, 1.1 lame.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/lame/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3445
Modified Files:
.cvsignore sources
Added Files:
lame-as-needed.patch lame-noexecstack.patch lame.spec
Log Message:
initial import from livna
lame-as-needed.patch:
--- NEW FILE lame-as-needed.patch ---
--- lame-3.97/libmp3lame/Makefile.am.no_undefined 2005-08-21 12:32:09.000000000 -0500
+++ lame-3.97/libmp3lame/Makefile.am 2006-10-20 12:06:51.000000000 -0500
@@ -18,7 +18,7 @@
decoder_ldadd =
endif
-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) @CONFIG_MATH_LIB@
libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
-no-undefined
--- lame-3.97/configure.in.no_undefined 2006-09-24 08:53:31.000000000 -0500
+++ lame-3.97/configure.in 2006-10-20 12:07:15.000000000 -0500
@@ -1059,8 +1059,9 @@
CFLAGS="${OPTIMIZATION} ${CFLAGS}"
LDADD="${LDADD}"
-FRONTEND_LDADD="${FRONTEND_LDADD} ${CONFIG_MATH_LIB}"
+FRONTEND_LDADD="${FRONTEND_LDADD}"
+AC_SUBST(CONFIG_MATH_LIB)
AC_SUBST(INCLUDES)
lame-noexecstack.patch:
--- NEW FILE lame-noexecstack.patch ---
diff -ur lame-3.97.orig/libmp3lame/i386/choose_table.nas lame-3.97/libmp3lame/i386/choose_table.nas
--- lame-3.97.orig/libmp3lame/i386/choose_table.nas 2000-10-27 13:19:05.000000000 +0200
+++ lame-3.97/libmp3lame/i386/choose_table.nas 2007-02-15 09:14:07.000000000 +0100
@@ -431,3 +431,7 @@
ret
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/cpu_feat.nas lame-3.97/libmp3lame/i386/cpu_feat.nas
--- lame-3.97.orig/libmp3lame/i386/cpu_feat.nas 2003-11-10 16:41:00.000000000 +0100
+++ lame-3.97/libmp3lame/i386/cpu_feat.nas 2007-02-15 09:13:58.000000000 +0100
@@ -105,3 +105,7 @@
ret
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fft.nas lame-3.97/libmp3lame/i386/fft.nas
--- lame-3.97.orig/libmp3lame/i386/fft.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fft.nas 2007-02-15 09:14:34.000000000 +0100
@@ -265,3 +265,7 @@
pop esi
pop ebx
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fft3dn.nas lame-3.97/libmp3lame/i386/fft3dn.nas
--- lame-3.97.orig/libmp3lame/i386/fft3dn.nas 2006-09-24 15:53:33.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fft3dn.nas 2007-02-15 09:14:18.000000000 +0100
@@ -275,3 +275,7 @@
add esp,16
popd ebp, ebx, esi, edi
endproc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fftfpu.nas lame-3.97/libmp3lame/i386/fftfpu.nas
--- lame-3.97.orig/libmp3lame/i386/fftfpu.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fftfpu.nas 2007-02-15 09:14:35.000000000 +0100
@@ -617,3 +617,7 @@
endproc
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fftsse.nas lame-3.97/libmp3lame/i386/fftsse.nas
--- lame-3.97.orig/libmp3lame/i386/fftsse.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fftsse.nas 2007-02-15 09:14:36.000000000 +0100
@@ -536,3 +536,7 @@
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/ffttbl.nas lame-3.97/libmp3lame/i386/ffttbl.nas
--- lame-3.97.orig/libmp3lame/i386/ffttbl.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/ffttbl.nas 2007-02-15 09:14:38.000000000 +0100
@@ -76,3 +76,7 @@
segment_code
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
--- NEW FILE lame.spec ---
Name: lame
Version: 3.97
Release: 7%{?dist}
Summary: Free MP3 audio compressor
Group: Applications/Multimedia
License: GPLv2+
URL: http://lame.sourceforge.net/
Source0: http://downloads.sourceforge.net/lame/%{name}-%{version}.tar.gz
Patch0: %{name}-as-needed.patch
Patch1: %{name}-noexecstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: gtk+-devel
# pkg-config should be pulled in by gtk+-devel but is not in EL-5
BuildRequires: pkgconfig
%ifarch %{ix86}
BuildRequires: nasm
BuildRequires: gcc >= 3.2
%endif
Requires: ncurses >= 5.0
Requires: %{name}-libs = %{version}-%{release}
%description
LAME is an open source MP3 encoder whose quality and speed matches
commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding
with both constant and variable bitrates.
%package libs
Summary: LAME MP3 encoding library
Group: System Environment/Libraries
%description libs
LAME MP3 encoding library.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
This package development files for %{name}.
%package mp3x
Summary: MP3 frame analyzer
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description mp3x
This package contains the mp3x frame analyzer.
%prep
%setup -q
%patch0 -p1 -b .as-needed
%patch1 -p1 -b .noexec
iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && mv ChangeLog.tmp ChangeLog
%build
autoreconf
sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
%ifarch %{ix86}
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
%endif
%configure \
--disable-dependency-tracking \
--disable-static \
%ifarch %{ix86}
--enable-nasm \
%endif
--enable-mp3x \
--enable-mp3rtp \
--enable-decode-layer1
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# Some apps still expect to find <lame.h>
ln -sf lame/lame.h $RPM_BUILD_ROOT%{_includedir}/lame.h
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
%check
make test
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-,root,root,-)
%doc README TODO USAGE doc/html/*.html doc/html/*.css
%{_bindir}/lame
%{_bindir}/mp3rtp
%{_mandir}/man1/lame.1*
%files libs
%defattr(-,root,root,-)
%doc ChangeLog COPYING LICENSE
%{_libdir}/libmp3lame.so.*
%files devel
%defattr (-,root,root,-)
%doc API HACKING STYLEGUIDE
%{_libdir}/libmp3lame.so
%{_includedir}/lame/
%{_includedir}/lame.h
%files mp3x
%defattr (-,root,root,-)
%{_bindir}/mp3x
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.97-7
- rebuild
* Thu Oct 4 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 3.97-6
- Merge freshrpms spec into livna spec for rpmfusion:
- Set release to 6 to be higher as both livna and freshrpms latest release
- Update license tag for new license tag guidelines
- Add --enable-decode-layer1 to configure flags
- Make Source0 the advised sf.net download url
- Make ChangeLog UTF-8
- Don't duplicate the COPYING ChangeLog and LICENSE docs betweent the main
and the -libs package
* Fri Sep 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.97-5
- BuildRequire pkgconfig for gtk+-devel in EL-5.
* Sun Mar 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 3.97-4
- fix rpaths and SELinux noexec stack issue (patch by Hans de Goede)
* Wed Nov 01 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-3
- fix FC6+ binutils issues (patch by Rex Dieter)
* Thu Sep 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-2
- Split off -libs subpackage
- Reenable parallel make
* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.97-1
- 3.97, 3DNow! asm patch applied upstream.
* Wed Sep 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.96.1-7
- Avoid rpaths (from Ubuntu).
- Don't ship static libraries.
- Drop unneeded zero epochs.
- Build with dependency tracking disabled.
- Prune pre-2003 changelog entries.
- Other specfile cleanups.
* Sun May 14 2006 Noa Resare <noa(a)resare.com> 3.96.1-6
- Adding a patch to fix the 3DNow! asm and re-enable it
* Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 3.96.1-5
- Disabling nasm for now. (bug #892)
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.4
- add defattr to files of mp3x subpackage
* Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.3
- Drop Epoch
* Sat Sep 17 2005 W. Michael Petullo <mike[at]flyn.org> - 0:3.96.1-0.lvn.2
- Split mp3x into its own package to remove general gtk+ requirement.
* Sun Jul 25 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96.1-0.lvn.1
- Updated to 3.96.1.
* Thu Apr 15 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96-0.lvn.1
- Updated to 3.96.
* Tue Jan 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.95.1-0.lvn.3
- Enable mp3x and mp3rtp.
- Run tests in the %%check section.
- Use "make install DESTDIR=..." instead of %%makeinstall.
- s/fdr/lvn/ in release tag.
* Tue Jan 27 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.2
- Disabled parallel make (#61).
* Sat Jan 17 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.1
- Updated to 3.95.1.
- Spec file edited to match current Fedora template.
- Re-wrote descriptions.
- Converted spec file to UTF-8.
* Sat Aug 16 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.8
- Patch configure instead of configure.in to avoid regenerating build files (bug 223).
* Mon Jul 21 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.7
- Rebuild to get source permissions right (bug 223).
- Removed Requires: /usr/bin/find (bug 223).
* Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.6
- Use RPM_BUILD_ROOT and RPM_OPT_FLAGS instead of macros.
* Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.5
- Backed out Vorbis changes (bug 198, 223).
* Fri May 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.4
- Fixed problems with Makefiles being removed from documentation upon
installation.
* Fri Apr 25 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.3
- Honour %%optflags.
- Vorbis support (bug #198).
- Added LICENSE to documentation.
* Fri Apr 4 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.2
- Minor adjustments of optimisation flags and configure settings.
- Killed some noise caused by a bad gtk macro.
- Added epoch numbers to requires.
* Wed Apr 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.1
- Initial Fedora RPM release.
* Mon Mar 31 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Rebuilt for Red Hat Linux 9.
- Exclude .la file.
* Mon Jan 13 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Update to 3.93.1.
- Removed Epoch: tag, upgrade by hand! :-/
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lame/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:52:18 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:32:49 -0000 1.2
@@ -0,0 +1 @@
+lame-3.97.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lame/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:52:18 -0000 1.1
+++ sources 3 Aug 2008 17:32:49 -0000 1.2
@@ -0,0 +1 @@
+90a4acbb730d150dfe80de145126eef7 lame-3.97.tar.gz
16 years, 3 months
- 1
- 0
rpms/lame/F-9 lame-as-needed.patch, NONE, 1.1 lame-noexecstack.patch, NONE, 1.1 lame.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/lame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3318
Modified Files:
.cvsignore sources
Added Files:
lame-as-needed.patch lame-noexecstack.patch lame.spec
Log Message:
initial import from livna
lame-as-needed.patch:
--- NEW FILE lame-as-needed.patch ---
--- lame-3.97/libmp3lame/Makefile.am.no_undefined 2005-08-21 12:32:09.000000000 -0500
+++ lame-3.97/libmp3lame/Makefile.am 2006-10-20 12:06:51.000000000 -0500
@@ -18,7 +18,7 @@
decoder_ldadd =
endif
-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) @CONFIG_MATH_LIB@
libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
-no-undefined
--- lame-3.97/configure.in.no_undefined 2006-09-24 08:53:31.000000000 -0500
+++ lame-3.97/configure.in 2006-10-20 12:07:15.000000000 -0500
@@ -1059,8 +1059,9 @@
CFLAGS="${OPTIMIZATION} ${CFLAGS}"
LDADD="${LDADD}"
-FRONTEND_LDADD="${FRONTEND_LDADD} ${CONFIG_MATH_LIB}"
+FRONTEND_LDADD="${FRONTEND_LDADD}"
+AC_SUBST(CONFIG_MATH_LIB)
AC_SUBST(INCLUDES)
lame-noexecstack.patch:
--- NEW FILE lame-noexecstack.patch ---
diff -ur lame-3.97.orig/libmp3lame/i386/choose_table.nas lame-3.97/libmp3lame/i386/choose_table.nas
--- lame-3.97.orig/libmp3lame/i386/choose_table.nas 2000-10-27 13:19:05.000000000 +0200
+++ lame-3.97/libmp3lame/i386/choose_table.nas 2007-02-15 09:14:07.000000000 +0100
@@ -431,3 +431,7 @@
ret
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/cpu_feat.nas lame-3.97/libmp3lame/i386/cpu_feat.nas
--- lame-3.97.orig/libmp3lame/i386/cpu_feat.nas 2003-11-10 16:41:00.000000000 +0100
+++ lame-3.97/libmp3lame/i386/cpu_feat.nas 2007-02-15 09:13:58.000000000 +0100
@@ -105,3 +105,7 @@
ret
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fft.nas lame-3.97/libmp3lame/i386/fft.nas
--- lame-3.97.orig/libmp3lame/i386/fft.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fft.nas 2007-02-15 09:14:34.000000000 +0100
@@ -265,3 +265,7 @@
pop esi
pop ebx
ret
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fft3dn.nas lame-3.97/libmp3lame/i386/fft3dn.nas
--- lame-3.97.orig/libmp3lame/i386/fft3dn.nas 2006-09-24 15:53:33.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fft3dn.nas 2007-02-15 09:14:18.000000000 +0100
@@ -275,3 +275,7 @@
add esp,16
popd ebp, ebx, esi, edi
endproc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fftfpu.nas lame-3.97/libmp3lame/i386/fftfpu.nas
--- lame-3.97.orig/libmp3lame/i386/fftfpu.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fftfpu.nas 2007-02-15 09:14:35.000000000 +0100
@@ -617,3 +617,7 @@
endproc
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/fftsse.nas lame-3.97/libmp3lame/i386/fftsse.nas
--- lame-3.97.orig/libmp3lame/i386/fftsse.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/fftsse.nas 2007-02-15 09:14:36.000000000 +0100
@@ -536,3 +536,7 @@
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff -ur lame-3.97.orig/libmp3lame/i386/ffttbl.nas lame-3.97/libmp3lame/i386/ffttbl.nas
--- lame-3.97.orig/libmp3lame/i386/ffttbl.nas 2000-10-04 14:13:26.000000000 +0200
+++ lame-3.97/libmp3lame/i386/ffttbl.nas 2007-02-15 09:14:38.000000000 +0100
@@ -76,3 +76,7 @@
segment_code
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
--- NEW FILE lame.spec ---
Name: lame
Version: 3.97
Release: 7%{?dist}
Summary: Free MP3 audio compressor
Group: Applications/Multimedia
License: GPLv2+
URL: http://lame.sourceforge.net/
Source0: http://downloads.sourceforge.net/lame/%{name}-%{version}.tar.gz
Patch0: %{name}-as-needed.patch
Patch1: %{name}-noexecstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: gtk+-devel
# pkg-config should be pulled in by gtk+-devel but is not in EL-5
BuildRequires: pkgconfig
%ifarch %{ix86}
BuildRequires: nasm
BuildRequires: gcc >= 3.2
%endif
Requires: ncurses >= 5.0
Requires: %{name}-libs = %{version}-%{release}
%description
LAME is an open source MP3 encoder whose quality and speed matches
commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding
with both constant and variable bitrates.
%package libs
Summary: LAME MP3 encoding library
Group: System Environment/Libraries
%description libs
LAME MP3 encoding library.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
This package development files for %{name}.
%package mp3x
Summary: MP3 frame analyzer
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description mp3x
This package contains the mp3x frame analyzer.
%prep
%setup -q
%patch0 -p1 -b .as-needed
%patch1 -p1 -b .noexec
iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && mv ChangeLog.tmp ChangeLog
%build
autoreconf
sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
%ifarch %{ix86}
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
%endif
%configure \
--disable-dependency-tracking \
--disable-static \
%ifarch %{ix86}
--enable-nasm \
%endif
--enable-mp3x \
--enable-mp3rtp \
--enable-decode-layer1
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# Some apps still expect to find <lame.h>
ln -sf lame/lame.h $RPM_BUILD_ROOT%{_includedir}/lame.h
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
%check
make test
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-,root,root,-)
%doc README TODO USAGE doc/html/*.html doc/html/*.css
%{_bindir}/lame
%{_bindir}/mp3rtp
%{_mandir}/man1/lame.1*
%files libs
%defattr(-,root,root,-)
%doc ChangeLog COPYING LICENSE
%{_libdir}/libmp3lame.so.*
%files devel
%defattr (-,root,root,-)
%doc API HACKING STYLEGUIDE
%{_libdir}/libmp3lame.so
%{_includedir}/lame/
%{_includedir}/lame.h
%files mp3x
%defattr (-,root,root,-)
%{_bindir}/mp3x
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.97-7
- rebuild
* Thu Oct 4 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 3.97-6
- Merge freshrpms spec into livna spec for rpmfusion:
- Set release to 6 to be higher as both livna and freshrpms latest release
- Update license tag for new license tag guidelines
- Add --enable-decode-layer1 to configure flags
- Make Source0 the advised sf.net download url
- Make ChangeLog UTF-8
- Don't duplicate the COPYING ChangeLog and LICENSE docs betweent the main
and the -libs package
* Fri Sep 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.97-5
- BuildRequire pkgconfig for gtk+-devel in EL-5.
* Sun Mar 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 3.97-4
- fix rpaths and SELinux noexec stack issue (patch by Hans de Goede)
* Wed Nov 01 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-3
- fix FC6+ binutils issues (patch by Rex Dieter)
* Thu Sep 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-2
- Split off -libs subpackage
- Reenable parallel make
* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.97-1
- 3.97, 3DNow! asm patch applied upstream.
* Wed Sep 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.96.1-7
- Avoid rpaths (from Ubuntu).
- Don't ship static libraries.
- Drop unneeded zero epochs.
- Build with dependency tracking disabled.
- Prune pre-2003 changelog entries.
- Other specfile cleanups.
* Sun May 14 2006 Noa Resare <noa(a)resare.com> 3.96.1-6
- Adding a patch to fix the 3DNow! asm and re-enable it
* Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 3.96.1-5
- Disabling nasm for now. (bug #892)
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.4
- add defattr to files of mp3x subpackage
* Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.3
- Drop Epoch
* Sat Sep 17 2005 W. Michael Petullo <mike[at]flyn.org> - 0:3.96.1-0.lvn.2
- Split mp3x into its own package to remove general gtk+ requirement.
* Sun Jul 25 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96.1-0.lvn.1
- Updated to 3.96.1.
* Thu Apr 15 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96-0.lvn.1
- Updated to 3.96.
* Tue Jan 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.95.1-0.lvn.3
- Enable mp3x and mp3rtp.
- Run tests in the %%check section.
- Use "make install DESTDIR=..." instead of %%makeinstall.
- s/fdr/lvn/ in release tag.
* Tue Jan 27 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.2
- Disabled parallel make (#61).
* Sat Jan 17 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.1
- Updated to 3.95.1.
- Spec file edited to match current Fedora template.
- Re-wrote descriptions.
- Converted spec file to UTF-8.
* Sat Aug 16 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.8
- Patch configure instead of configure.in to avoid regenerating build files (bug 223).
* Mon Jul 21 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.7
- Rebuild to get source permissions right (bug 223).
- Removed Requires: /usr/bin/find (bug 223).
* Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.6
- Use RPM_BUILD_ROOT and RPM_OPT_FLAGS instead of macros.
* Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.5
- Backed out Vorbis changes (bug 198, 223).
* Fri May 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.4
- Fixed problems with Makefiles being removed from documentation upon
installation.
* Fri Apr 25 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.3
- Honour %%optflags.
- Vorbis support (bug #198).
- Added LICENSE to documentation.
* Fri Apr 4 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.2
- Minor adjustments of optimisation flags and configure settings.
- Killed some noise caused by a bad gtk macro.
- Added epoch numbers to requires.
* Wed Apr 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.1
- Initial Fedora RPM release.
* Mon Mar 31 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Rebuilt for Red Hat Linux 9.
- Exclude .la file.
* Mon Jan 13 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Update to 3.93.1.
- Removed Epoch: tag, upgrade by hand! :-/
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lame/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:52:18 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:32:32 -0000 1.2
@@ -0,0 +1 @@
+lame-3.97.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lame/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:52:18 -0000 1.1
+++ sources 3 Aug 2008 17:32:32 -0000 1.2
@@ -0,0 +1 @@
+90a4acbb730d150dfe80de145126eef7 lame-3.97.tar.gz
16 years, 3 months
- 1
- 0
rpms/faad2/F-8 faad2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/faad2/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3196
Modified Files:
.cvsignore sources
Added Files:
faad2.spec
Log Message:
initial import from livna
--- NEW FILE faad2.spec ---
%{?el4:%define _without_sysfs 1}
%{?fc3:%define _without_sysfs 1}
%{?fc2:%define _without_sysfs 1}
%{?fc1:%define _without_sysfs 1}
%{?el3:%define _without_sysfs 1}
%{?rh9:%define _without_sysfs 1}
%{?rh7:%define _without_sysfs 1}
%{?el2:%define _without_sysfs 1}
%define xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
Version: 2.6.1
Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.audiocoding.com/faad2.html
Source: http://download.sourceforge.net/faac/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++
BuildRequires: id3lib-devel
%{!?_without_sysfs:BuildRequires: libsysfs-devel}
BuildRequires: libtool
BuildRequires: xmms-devel
BuildRequires: zlib-devel
%description
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
%package libs
Summary: Shared libraries of the FAAD 2 AAC decoder
Group: System Environment/Libraries
Obsoletes: %{name} < 1:2.6.1-3
%description libs
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains libfaad.
%package devel
Summary: Development libraries of the FAAD 2 AAC decoder
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description devel
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains development files and documentation for libfaad.
%package -n xmms-%{name}
Summary: AAC XMMS Input Plugin
Group: Applications/Multimedia
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: xmms-aac = %{version}-%{release}
%description -n xmms-%{name}
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains an input plugin for xmms.
%prep
%setup -q -n %{name}
find . -name "*.c" -o -name "*.h" | xargs chmod 644
for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
tr -d '\r' <$f >$f.n && mv -f $f.n $f
done
%build
# This is what the README.linux file recommends
autoreconf -vif
%configure \
--disable-static \
--with-xmms \
# --with-drm
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
%{__rm} %{buildroot}%{_libdir}/libfaad.la
%{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la
%clean
%{__rm} -rf %{buildroot}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README* TODO
%{_bindir}/faad
%files libs
%defattr(-,root,root,-)
%{_libdir}/libfaad.so.*
%files devel
%defattr(-, root, root, -)
%{_includedir}/faad.h
%{_includedir}/neaacdec.h
%{_libdir}/libfaad.so
%files -n xmms-%{name}
%defattr(-,root,root,-)
%doc plugins/xmms/AUTHORS plugins/xmms/NEWS
%{xmmsinputplugindir}/libmp4.so
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:2.6.1-4
- rebuild
* Sun Jan 13 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-3
- split off libs to avoid multilib conflicts
* Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-2
- bring back the XMMS plugin
- move EOL fixup to prep
- fix URLs
* Thu Nov 01 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-1
- remerge freshrpms specfile
- update to latest upstream, fixes licensing issues!
* Thu Oct 18 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-21
- fix missing epochs in dependencies
* Tue Oct 16 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-20
- revert from 2.5
* Wed Sep 26 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-4
- disable drm, fixes playback of many AAC streams (bug #1465)
* Sun Sep 23 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-3
- remove redundant BRs
- don't disable backward compatibility (breaks ffmpeg)
- silence tar in setup
- use disttag
- fix source file permissions and other rpmlint warnings
* Sat Sep 15 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.5-2
- import faad2 from freshrpms as discussed on on repomerge-list
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.0-19
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-18.20050131
- Rebuild.
* Sat Jun 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-17.20050131
- Let soname based autogenerated deps take care of xmms-libs (#1018).
- Revert x86_64 patch to the correct one again (#1017).
* Thu Jun 15 2006 Noa Resare <noa(a)resare.com> - 2.0-16.20050131
- reverted to obviously broken x86_64 patch to preserve binary compatibility
and prevent slow motion bug (#1017)
- fixed xmms-libs regression (#1018)
* Wed May 24 2006 Noa Resare <noa(a)resare.com> - 2.0-15.20050131
- added patch to fix apple trailer playback problem
* Tue May 23 2006 Noa Resare <noa(a)resare.com> - 2.0-14.20050131
- reverted to older cvs to avoid a GPL violating extra redistribution
requirement in README
- changed the bogus uint8_t to correct uin32_t in the x86_64 patch
* Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-13.20060505
- Avoid aclocal >= 1.8 warnings.
* Sun May 21 2006 Noa Resare <noa(a)resare.com> - 2.0-12.20060505
- re-introduce the x86_64 patch to restore binary compatibility
* Sat May 20 2006 Noa Resare <noa(a)resare.com> - 2.0-10.20060505
- patch the sources to be binary compatible with old faad2
- remove library major version bump
- add symbol versioning script for new symbols
* Fri May 05 2006 Noa Resare <noa(a)resare.com> - 2.0-9.20060505
- upgrade to cvs version
- mp4v2 is no longer included (now a separate package)
- bump libary major version
- drop static library
- remove mp4ff headers from -devel
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.0-8
- Drop Epoch completely
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Jan 17 2006 Adrian Reber <adrian(a)lisas.de> - 2.0-0.lvn.7
- Removed change of ownership to root:root during %%install
- Droped Epoch
* Sat Oct 01 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info - 0:2.0-0.lvn.6
- Add faad2-amd64.patch to fix #510
* Wed Jun 15 2005 Ricahrd June <rjune[AT]bravegnuworld.com> - 0:2.0-0.lvn.5
- Included some hand install lines because make install did not place some required header files
* Wed Apr 27 2005 Dams <anvil[AT]livna.org> - 0:2.0-0.lvn.4
- Fixed gcc4 build
* Fri Nov 12 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.3
- Fixing gcc34 build
* Wed Oct 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.lvn.2
- libsndfile is no longer required since 2.0rc1.
* Wed Mar 10 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.1
- Updated to 2.0 final release
- Added missing defattr
- Added xmms-aac provides to xmms-{name}
- Fixed makefile (patch)
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:2.0-0.fdr.0.1.rc1
- Updated to 2.0 rc1
- Added xmms-faad2 subpackage
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.4
- Added missing scriplets
- buildroot -> RPM_BUILD_ROOT
* Tue Apr 15 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.3
- turned bootstrap into ./bootstrap to prevent build to fail with
people who dont have "." in their PATH.
* Sat Apr 12 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.2
- Typo in devel Requires.
* Sat Apr 12 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/faad2/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:49:58 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:31:39 -0000 1.2
@@ -0,0 +1 @@
+faad2-2.6.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/faad2/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:49:58 -0000 1.1
+++ sources 3 Aug 2008 17:31:39 -0000 1.2
@@ -0,0 +1 @@
+74e92df40c270f216a8305fc87603c8a faad2-2.6.1.tar.gz
16 years, 3 months
- 1
- 0
rpms/faad2/F-9 faad2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/faad2/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3073
Modified Files:
.cvsignore sources
Added Files:
faad2.spec
Log Message:
initial import from livna
--- NEW FILE faad2.spec ---
%{?el4:%define _without_sysfs 1}
%{?fc3:%define _without_sysfs 1}
%{?fc2:%define _without_sysfs 1}
%{?fc1:%define _without_sysfs 1}
%{?el3:%define _without_sysfs 1}
%{?rh9:%define _without_sysfs 1}
%{?rh7:%define _without_sysfs 1}
%{?el2:%define _without_sysfs 1}
%define xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
Version: 2.6.1
Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.audiocoding.com/faad2.html
Source: http://download.sourceforge.net/faac/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++
BuildRequires: id3lib-devel
%{!?_without_sysfs:BuildRequires: libsysfs-devel}
BuildRequires: libtool
BuildRequires: xmms-devel
BuildRequires: zlib-devel
%description
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
%package libs
Summary: Shared libraries of the FAAD 2 AAC decoder
Group: System Environment/Libraries
Obsoletes: %{name} < 1:2.6.1-3
%description libs
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains libfaad.
%package devel
Summary: Development libraries of the FAAD 2 AAC decoder
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description devel
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains development files and documentation for libfaad.
%package -n xmms-%{name}
Summary: AAC XMMS Input Plugin
Group: Applications/Multimedia
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: xmms-aac = %{version}-%{release}
%description -n xmms-%{name}
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains an input plugin for xmms.
%prep
%setup -q -n %{name}
find . -name "*.c" -o -name "*.h" | xargs chmod 644
for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
tr -d '\r' <$f >$f.n && mv -f $f.n $f
done
%build
# This is what the README.linux file recommends
autoreconf -vif
%configure \
--disable-static \
--with-xmms \
# --with-drm
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
%{__rm} %{buildroot}%{_libdir}/libfaad.la
%{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la
%clean
%{__rm} -rf %{buildroot}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README* TODO
%{_bindir}/faad
%files libs
%defattr(-,root,root,-)
%{_libdir}/libfaad.so.*
%files devel
%defattr(-, root, root, -)
%{_includedir}/faad.h
%{_includedir}/neaacdec.h
%{_libdir}/libfaad.so
%files -n xmms-%{name}
%defattr(-,root,root,-)
%doc plugins/xmms/AUTHORS plugins/xmms/NEWS
%{xmmsinputplugindir}/libmp4.so
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:2.6.1-4
- rebuild
* Sun Jan 13 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-3
- split off libs to avoid multilib conflicts
* Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-2
- bring back the XMMS plugin
- move EOL fixup to prep
- fix URLs
* Thu Nov 01 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-1
- remerge freshrpms specfile
- update to latest upstream, fixes licensing issues!
* Thu Oct 18 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-21
- fix missing epochs in dependencies
* Tue Oct 16 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-20
- revert from 2.5
* Wed Sep 26 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-4
- disable drm, fixes playback of many AAC streams (bug #1465)
* Sun Sep 23 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-3
- remove redundant BRs
- don't disable backward compatibility (breaks ffmpeg)
- silence tar in setup
- use disttag
- fix source file permissions and other rpmlint warnings
* Sat Sep 15 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.5-2
- import faad2 from freshrpms as discussed on on repomerge-list
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.0-19
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-18.20050131
- Rebuild.
* Sat Jun 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-17.20050131
- Let soname based autogenerated deps take care of xmms-libs (#1018).
- Revert x86_64 patch to the correct one again (#1017).
* Thu Jun 15 2006 Noa Resare <noa(a)resare.com> - 2.0-16.20050131
- reverted to obviously broken x86_64 patch to preserve binary compatibility
and prevent slow motion bug (#1017)
- fixed xmms-libs regression (#1018)
* Wed May 24 2006 Noa Resare <noa(a)resare.com> - 2.0-15.20050131
- added patch to fix apple trailer playback problem
* Tue May 23 2006 Noa Resare <noa(a)resare.com> - 2.0-14.20050131
- reverted to older cvs to avoid a GPL violating extra redistribution
requirement in README
- changed the bogus uint8_t to correct uin32_t in the x86_64 patch
* Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-13.20060505
- Avoid aclocal >= 1.8 warnings.
* Sun May 21 2006 Noa Resare <noa(a)resare.com> - 2.0-12.20060505
- re-introduce the x86_64 patch to restore binary compatibility
* Sat May 20 2006 Noa Resare <noa(a)resare.com> - 2.0-10.20060505
- patch the sources to be binary compatible with old faad2
- remove library major version bump
- add symbol versioning script for new symbols
* Fri May 05 2006 Noa Resare <noa(a)resare.com> - 2.0-9.20060505
- upgrade to cvs version
- mp4v2 is no longer included (now a separate package)
- bump libary major version
- drop static library
- remove mp4ff headers from -devel
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.0-8
- Drop Epoch completely
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Tue Jan 17 2006 Adrian Reber <adrian(a)lisas.de> - 2.0-0.lvn.7
- Removed change of ownership to root:root during %%install
- Droped Epoch
* Sat Oct 01 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info - 0:2.0-0.lvn.6
- Add faad2-amd64.patch to fix #510
* Wed Jun 15 2005 Ricahrd June <rjune[AT]bravegnuworld.com> - 0:2.0-0.lvn.5
- Included some hand install lines because make install did not place some required header files
* Wed Apr 27 2005 Dams <anvil[AT]livna.org> - 0:2.0-0.lvn.4
- Fixed gcc4 build
* Fri Nov 12 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.3
- Fixing gcc34 build
* Wed Oct 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.lvn.2
- libsndfile is no longer required since 2.0rc1.
* Wed Mar 10 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.1
- Updated to 2.0 final release
- Added missing defattr
- Added xmms-aac provides to xmms-{name}
- Fixed makefile (patch)
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:2.0-0.fdr.0.1.rc1
- Updated to 2.0 rc1
- Added xmms-faad2 subpackage
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.4
- Added missing scriplets
- buildroot -> RPM_BUILD_ROOT
* Tue Apr 15 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.3
- turned bootstrap into ./bootstrap to prevent build to fail with
people who dont have "." in their PATH.
* Sat Apr 12 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.2
- Typo in devel Requires.
* Sat Apr 12 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/faad2/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:49:58 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:31:25 -0000 1.2
@@ -0,0 +1 @@
+faad2-2.6.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/faad2/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:49:58 -0000 1.1
+++ sources 3 Aug 2008 17:31:25 -0000 1.2
@@ -0,0 +1 @@
+74e92df40c270f216a8305fc87603c8a faad2-2.6.1.tar.gz
16 years, 3 months
- 1
- 0
rpms/amule/F-8 aMule-2.1.3-gcc43.patch, NONE, 1.1 aMule-2.1.3-multiple.patch, NONE, 1.1 aMule-2.1.3-ocreate.patch, NONE, 1.1 aMule-wx-1.2.patch, NONE, 1.1 amule.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/amule/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2922
Modified Files:
.cvsignore sources
Added Files:
aMule-2.1.3-gcc43.patch aMule-2.1.3-multiple.patch
aMule-2.1.3-ocreate.patch aMule-wx-1.2.patch amule.spec
Log Message:
initial import from livna
aMule-2.1.3-gcc43.patch:
--- NEW FILE aMule-2.1.3-gcc43.patch ---
diff -up aMule-2.1.3/src/ED2KLinkParser.cpp.gcc43 aMule-2.1.3/src/ED2KLinkParser.cpp
--- aMule-2.1.3/src/ED2KLinkParser.cpp.gcc43 2008-04-08 15:46:36.000000000 +0200
+++ aMule-2.1.3/src/ED2KLinkParser.cpp 2008-04-08 15:47:16.000000000 +0200
@@ -32,6 +32,7 @@ const int versionRevision = 1;
#include <sstream>
#include <iostream>
#include <fstream>
+#include <cstdlib>
#ifdef __APPLE__
#include <CoreServices/CoreServices.h>
aMule-2.1.3-multiple.patch:
--- NEW FILE aMule-2.1.3-multiple.patch ---
diff -up aMule-2.1.3/src/ExternalConnector.h.multiple aMule-2.1.3/src/ExternalConnector.h
--- aMule-2.1.3/src/ExternalConnector.h.multiple 2008-04-08 15:33:04.000000000 +0200
+++ aMule-2.1.3/src/ExternalConnector.h 2008-04-08 15:38:22.000000000 +0200
@@ -143,7 +143,7 @@ public:
bool Parse_Command(const wxString& buffer);
void GetCommand(const wxString &prompt, char* buffer, size_t buffer_size);
const CECPacket *SendRecvMsg_v2(const CECPacket *request) { return m_ECClient->SendRecvPacket(request); }
- void ConnectAndRun(const wxString &ProgName, const wxString& ProgName);
+ void ConnectAndRun(const wxString &ProgName, const wxString& ProgVersion);
void ShowGreet();
//
aMule-2.1.3-ocreate.patch:
--- NEW FILE aMule-2.1.3-ocreate.patch ---
diff -up aMule-2.1.3/src/FileFunctions.cpp.ocreate aMule-2.1.3/src/FileFunctions.cpp
--- aMule-2.1.3/src/FileFunctions.cpp.ocreate 2008-04-08 03:27:56.000000000 +0200
+++ aMule-2.1.3/src/FileFunctions.cpp 2008-04-08 03:32:13.000000000 +0200
@@ -599,7 +599,7 @@ FSCheckResult DoCheckFileSystem(const wx
wxString fullName = JoinPaths(path, wxT(":"));
// Try to open the file, without overwriting existing files.
- int fd = open(fullName.fn_str(), O_WRONLY | O_CREAT | O_EXCL);
+ int fd = open(fullName.fn_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
if (fd != -1) {
// Success, the file-system cant be FAT32
close(fd);
aMule-wx-1.2.patch:
--- NEW FILE aMule-wx-1.2.patch ---
diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16 13:09:29.000000000 +0100
+++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17 20:20:47.151203000 +0100
@@ -297,7 +297,7 @@
m_validateButton =
new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
m_cancelButton =
- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
+ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
@@ -321,7 +321,6 @@
EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog
EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
END_EVENT_TABLE ()
--- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250 +0100
+++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250 +0100
@@ -101,8 +101,7 @@
ID_AUTOSTATIMG_COMBO,
ID_AUTOSTATIMG_BROWSE_BUTTON,
ID_FTP_UPDATE_CHECK,
- ID_VALIDATE_BUTTON,
- ID_CANCEL_BUTTON
+ ID_VALIDATE_BUTTON
};
protected:
--- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100
+++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100
@@ -24,7 +24,6 @@
#include <wx/mstream.h>
#include <wx/gifdecod.h>
-#include <wx/window.h>
#include <wx/dcbuffer.h>
#include "MuleGifCtrl.h"
@@ -35,6 +34,50 @@
EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
END_EVENT_TABLE()
+#if wxCHECK_VERSION(2, 7, 1)
+// Wrapper that emulates old wxGIFDecoder API
+
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+ MuleGIFDecoder(wxInputStream* stream, bool dummy) {
+ m_stream = stream;
+ dummy = dummy; // Unused.
+ m_nframe = 0;
+ }
+
+ ~MuleGIFDecoder() { /* don't delete the stream! */ }
+
+ wxGIFErrorCode ReadGIF() {
+ return LoadGIF(*m_stream);
+ }
+
+ void GoFirstFrame() { m_nframe = 0; }
+ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
+ void GoLastFrame() { m_nframe = GetFrameCount(); }
+
+ void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
+
+ size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
+ size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
+
+ size_t GetLeft() { return 0; }
+ size_t GetTop() { return 0; }
+
+ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
+
+private:
+ uint32_t m_nframe;
+ wxInputStream* m_stream;
+};
+
+#else
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+ MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
+};
+#endif
+
+
MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, long style, const wxValidator& validator,
@@ -66,7 +109,7 @@
}
wxMemoryInputStream stream(data, size);
- m_decoder = new wxGIFDecoder(&stream, TRUE);
+ m_decoder = new MuleGIFDecoder(&stream, TRUE);
if ( m_decoder->ReadGIF() != wxGIF_OK ) {
delete m_decoder;
m_decoder = NULL;
@@ -137,3 +180,4 @@
dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
}
+// File_checked_for_headers
--- aMule/src/MuleGifCtrl.h 2006-01-01 06:17:25.000000000 +0100
+++ aMule/src/MuleGifCtrl.h 2006-11-18 05:01:22.000000000 +0100
@@ -27,11 +27,10 @@
#include <wx/control.h>
#include <wx/timer.h>
-#include <wx/bitmap.h>
const int GIFTIMERID = 271283;
-class wxGIFDecoder;
+class MuleGIFDecoder;
class wxBitmap;
/**
@@ -121,7 +120,7 @@
void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
//! A pointer to the current gif-animation.
- wxGIFDecoder* m_decoder;
+ MuleGIFDecoder* m_decoder;
//! Timer used for the delay between each frame.
wxTimer m_timer;
//! Current frame.
@@ -133,3 +132,4 @@
#endif
+// File_checked_for_headers
--- aMule-2.1.3/src/MuleTextCtrl.cpp~ 2006-12-17 20:55:37.157820250 +0100
+++ aMule-2.1.3/src/MuleTextCtrl.cpp 2006-12-17 20:56:21.328580750 +0100
@@ -26,6 +26,7 @@
#include <wx/menu.h>
#include <wx/intl.h>
#include <wx/clipbrd.h>
+#include <wx/dataobj.h>
/**
* These are the IDs used to identify the different menu-items.
--- amule/src/amule.cpp~ 2006-12-17 21:53:26.474639000 +0100
+++ amule/src/amule.cpp 2006-12-17 21:55:40.307003000 +0100
@@ -96,6 +96,7 @@
#include <CoreFoundation/CFBundle.h>
#include <wx/mac/corefoundation/cfstring.h>
#endif
+ #include <wx/msgdlg.h>
#endif
--- NEW FILE amule.spec ---
Name: amule
Version: 2.1.3
Release: 4%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.bz2
Patch0: aMule-wx-1.2.patch
Patch1: aMule-2.1.3-ocreate.patch
Patch2: aMule-2.1.3-multiple.patch
Patch3: aMule-2.1.3-gcc43.patch
URL: http://amule.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
BuildRequires: wxGTK-devel >= 0:2.6.2, desktop-file-utils, expat-devel
BuildRequires: gd-devel >= 2.0.0, libpng-devel
BuildRequires: gettext-devel, flex, bison
BuildRequires: readline-devel
Requires(pre): chkconfig
%description
aMule is an easy to use multi-platform client for ED2K Peer-to-Peer
Network. It is a fork of xMule, whis was based on eMule for
Windows. aMule currently supports (but is not limited to) the
following platforms: Linux, *BSD and MacOS X.
%package -n xchat-%{name}
Summary: Plugin to display aMule's statistics in XChat
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: xchat
%description -n xchat-%{name}
This plugins allows you to display aMule statistics in XChat
%prep
%setup -q -n aMule-%{version}
%patch0 -p1 -b .wx28
%patch1 -p1 -b .ocreate
%patch2 -p1 -b .multiple
%patch3 -p1 -b .gcc43
%build
%configure \
--disable-rpath \
--disable-debug \
--enable-wxcas \
--enable-cas \
--enable-alc \
--enable-alcc \
--enable-amule-daemon \
--enable-amulecmd \
--enable-webserver \
--enable-amule-daemon \
--enable-utf8-systray
# --enable-amule-gui compile aMule remote GUI (EXPERIMENTAL)
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}
# desktop files
desktop-file-install --vendor livna \
--delete-original\
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--add-category Application\
--add-category Network\
--add-category X-Livna\
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
iconv -f ISO-8859-1 -t UTF-8 < src/utils/aLinkCreator/alc.desktop \
> $RPM_BUILD_ROOT%{_datadir}/applications/alc.desktop
desktop-file-install --vendor livna \
--delete-original\
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--add-category X-Livna\
$RPM_BUILD_ROOT%{_datadir}/applications/alc.desktop
install -m 644 src/utils/aLinkCreator/alc.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/alc.xpm
desktop-file-install --vendor livna \
--delete-original\
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--add-category X-Livna\
$RPM_BUILD_ROOT%{_datadir}/applications/wxcas.desktop
install -m 644 src/utils/wxCas/wxcas.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%doc %{_datadir}/doc/aMule-%{version}
%{_bindir}/*
%{_datadir}/%{name}/
%{_datadir}/cas
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
%{_mandir}/man1/*.gz
%{_mandir}/*/man1/*.gz
%files -n xchat-%{name}
%defattr(-,root,root)
%{_libdir}/xchat/plugins/xas.pl
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.1.3-4
- rebuild
* Tue Mar 04 2007 kwizart <kwizart at gmail.com > - 2.1.3-3
- Fix wxGTK 2.8.x
- Fix open with O_CREATE
- Prevent timestramps on install
- Add missing BR
- Fix gcc43
- Fix multiple parameter named ProgName
* Sat Oct 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.1.3-2
- rebuild
* Mon Jun 12 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.3-1
- version 2.1.3
* Tue May 30 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
- version 2.1.2
* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
- version 2.1.1
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Jun 16 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.3-0.lvn.1
- version 2.0.3
* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.2-0.lvn.1
- version 2.0.2
* Sat Jun 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.0.1-0.lvn.2
- BR /usr/bin/autopoint instead of gettext; This gives us gettext on pre
FC4 and gettext-devel on FC4
* Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.1-0.lvn.1
- version 2.0.1
* Wed May 04 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.1
- version 2.0 final(ly)
- drop epoch
* Fri Dec 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.7.rc8
- update to rc8
* Wed Oct 20 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.6.rc7
- update to rc7: no need for cryptopp anymore
* Mon Jul 19 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.5.rc5
- update to rc5
* Wed Jul 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.4.rc4a
- update to rc4a (hotfix)
* Wed Jul 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.3.rc4
- fix desktop files for alc and wxcas
- convert tabs into spaces (use diff -b)
* Tue Jul 13 2004 Dams <anvil[AT]livna.org> 0:2.0.0-0.lvn.0.2.rc4
- Removing temporary _docs directory before attempting to create it
* Mon Jul 12 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.1.rc4
- Version 2.0.0rc4
- new xchat-amule subpackage
* Sun Jun 13 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.1.rc3
- Version 2.0.0rc3
* Tue Feb 17 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.6-0.lvn.1
- Version 1.2.6
* Tue Feb 10 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.5-0.lvn.1
- Version 1.2.5
- Dropped alternatives support (we conflict and obsolete xmule)
* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.2.4-0.lvn.4
- Added explicit BuildReq:openssl-devel (else it wont build on rh9/rh8
because of curl-devel packaging bug)
* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.2.4-0.lvn.3
- Re-add explicit conflits:xmule
* Tue Jan 13 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-0.lvn.2
- Obsoletes xmule (the project seems to have stopped)
* Mon Jan 12 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-0.lvn.1
- version 1.2.4 (small bugfix release)
* Sat Jan 03 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-0.lvn.1
- new version: 1.2.3
- added webserver support (still a little buggy according to aMule's website)
* Thu Dec 18 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-0.lvn.2
- remove enable-optimize
- update Conflicts
- add Epoch: 0
* Mon Dec 15 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-0.lvn.1
- version 1.2.1
- doesn't require wget anymore : libcurl is used instead
- add BuildRequires: curl-devel
- Move Prereq to Requires(pre)
- add enable-optimise to configure
* Thu Nov 27 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-0.lvn.1
- version 1.2.0
* Fri Nov 14 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.3
- Change conflicts
- s/Fedora/Livna/
* Wed Nov 12 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.2
- fix preun
* Wed Nov 12 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.1
- lots of fixes, thanks to Dams (anvil[AT]livna.org)
* Wed Nov 05 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-1
- new version
* Sat Nov 01 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.1-1
- RedHatification (from PLF/Mandrake)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:47:16 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:30:30 -0000 1.2
@@ -0,0 +1 @@
+aMule-2.1.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:47:16 -0000 1.1
+++ sources 3 Aug 2008 17:30:30 -0000 1.2
@@ -0,0 +1 @@
+0aafdd159edb8ad5f0064da87998b47d aMule-2.1.3.tar.bz2
16 years, 3 months
- 1
- 0
rpms/amule/F-9 amule.spec,NONE,1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/amule/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2711
Added Files:
amule.spec
Log Message:
initial import from livna
--- NEW FILE amule.spec ---
Name: amule
Version: 2.1.3
Release: 4%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.bz2
Patch0: aMule-wx-1.2.patch
Patch1: aMule-2.1.3-ocreate.patch
Patch2: aMule-2.1.3-multiple.patch
Patch3: aMule-2.1.3-gcc43.patch
URL: http://amule.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
BuildRequires: wxGTK-devel >= 0:2.6.2, desktop-file-utils, expat-devel
BuildRequires: gd-devel >= 2.0.0, libpng-devel
BuildRequires: gettext-devel, flex, bison
BuildRequires: readline-devel
Requires(pre): chkconfig
%description
aMule is an easy to use multi-platform client for ED2K Peer-to-Peer
Network. It is a fork of xMule, whis was based on eMule for
Windows. aMule currently supports (but is not limited to) the
following platforms: Linux, *BSD and MacOS X.
%package -n xchat-%{name}
Summary: Plugin to display aMule's statistics in XChat
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: xchat
%description -n xchat-%{name}
This plugins allows you to display aMule statistics in XChat
%prep
%setup -q -n aMule-%{version}
%patch0 -p1 -b .wx28
%patch1 -p1 -b .ocreate
%patch2 -p1 -b .multiple
%patch3 -p1 -b .gcc43
%build
%configure \
--disable-rpath \
--disable-debug \
--enable-wxcas \
--enable-cas \
--enable-alc \
--enable-alcc \
--enable-amule-daemon \
--enable-amulecmd \
--enable-webserver \
--enable-amule-daemon \
--enable-utf8-systray
# --enable-amule-gui compile aMule remote GUI (EXPERIMENTAL)
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT _docs
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}
# desktop files
desktop-file-install --vendor livna \
--delete-original\
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--add-category Application\
--add-category Network\
--add-category X-Livna\
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
iconv -f ISO-8859-1 -t UTF-8 < src/utils/aLinkCreator/alc.desktop \
> $RPM_BUILD_ROOT%{_datadir}/applications/alc.desktop
desktop-file-install --vendor livna \
--delete-original\
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--add-category X-Livna\
$RPM_BUILD_ROOT%{_datadir}/applications/alc.desktop
install -m 644 src/utils/aLinkCreator/alc.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/alc.xpm
desktop-file-install --vendor livna \
--delete-original\
--dir $RPM_BUILD_ROOT%{_datadir}/applications\
--add-category X-Livna\
$RPM_BUILD_ROOT%{_datadir}/applications/wxcas.desktop
install -m 644 src/utils/wxCas/wxcas.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%doc %{_datadir}/doc/aMule-%{version}
%{_bindir}/*
%{_datadir}/%{name}/
%{_datadir}/cas
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
%{_mandir}/man1/*.gz
%{_mandir}/*/man1/*.gz
%files -n xchat-%{name}
%defattr(-,root,root)
%{_libdir}/xchat/plugins/xas.pl
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.1.3-4
- rebuild
* Tue Mar 04 2007 kwizart <kwizart at gmail.com > - 2.1.3-3
- Fix wxGTK 2.8.x
- Fix open with O_CREATE
- Prevent timestramps on install
- Add missing BR
- Fix gcc43
- Fix multiple parameter named ProgName
* Sat Oct 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.1.3-2
- rebuild
* Mon Jun 12 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.3-1
- version 2.1.3
* Tue May 30 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
- version 2.1.2
* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
- version 2.1.1
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Jun 16 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.3-0.lvn.1
- version 2.0.3
* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.2-0.lvn.1
- version 2.0.2
* Sat Jun 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.0.1-0.lvn.2
- BR /usr/bin/autopoint instead of gettext; This gives us gettext on pre
FC4 and gettext-devel on FC4
* Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.1-0.lvn.1
- version 2.0.1
* Wed May 04 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.1
- version 2.0 final(ly)
- drop epoch
* Fri Dec 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.7.rc8
- update to rc8
* Wed Oct 20 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.6.rc7
- update to rc7: no need for cryptopp anymore
* Mon Jul 19 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.5.rc5
- update to rc5
* Wed Jul 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.4.rc4a
- update to rc4a (hotfix)
* Wed Jul 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.3.rc4
- fix desktop files for alc and wxcas
- convert tabs into spaces (use diff -b)
* Tue Jul 13 2004 Dams <anvil[AT]livna.org> 0:2.0.0-0.lvn.0.2.rc4
- Removing temporary _docs directory before attempting to create it
* Mon Jul 12 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.1.rc4
- Version 2.0.0rc4
- new xchat-amule subpackage
* Sun Jun 13 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.1.rc3
- Version 2.0.0rc3
* Tue Feb 17 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.6-0.lvn.1
- Version 1.2.6
* Tue Feb 10 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.5-0.lvn.1
- Version 1.2.5
- Dropped alternatives support (we conflict and obsolete xmule)
* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.2.4-0.lvn.4
- Added explicit BuildReq:openssl-devel (else it wont build on rh9/rh8
because of curl-devel packaging bug)
* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.2.4-0.lvn.3
- Re-add explicit conflits:xmule
* Tue Jan 13 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-0.lvn.2
- Obsoletes xmule (the project seems to have stopped)
* Mon Jan 12 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-0.lvn.1
- version 1.2.4 (small bugfix release)
* Sat Jan 03 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-0.lvn.1
- new version: 1.2.3
- added webserver support (still a little buggy according to aMule's website)
* Thu Dec 18 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-0.lvn.2
- remove enable-optimize
- update Conflicts
- add Epoch: 0
* Mon Dec 15 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-0.lvn.1
- version 1.2.1
- doesn't require wget anymore : libcurl is used instead
- add BuildRequires: curl-devel
- Move Prereq to Requires(pre)
- add enable-optimise to configure
* Thu Nov 27 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-0.lvn.1
- version 1.2.0
* Fri Nov 14 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.3
- Change conflicts
- s/Fedora/Livna/
* Wed Nov 12 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.2
- fix preun
* Wed Nov 12 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.1
- lots of fixes, thanks to Dams (anvil[AT]livna.org)
* Wed Nov 05 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-1
- new version
* Sat Nov 01 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.1-1
- RedHatification (from PLF/Mandrake)
16 years, 3 months
- 1
- 0
rpms/amule/F-9 aMule-2.1.3-gcc43.patch, NONE, 1.1 aMule-2.1.3-multiple.patch, NONE, 1.1 aMule-2.1.3-ocreate.patch, NONE, 1.1 aMule-wx-1.2.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/amule/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2353
Modified Files:
.cvsignore sources
Added Files:
aMule-2.1.3-gcc43.patch aMule-2.1.3-multiple.patch
aMule-2.1.3-ocreate.patch aMule-wx-1.2.patch
Log Message:
initial import from livna
aMule-2.1.3-gcc43.patch:
--- NEW FILE aMule-2.1.3-gcc43.patch ---
diff -up aMule-2.1.3/src/ED2KLinkParser.cpp.gcc43 aMule-2.1.3/src/ED2KLinkParser.cpp
--- aMule-2.1.3/src/ED2KLinkParser.cpp.gcc43 2008-04-08 15:46:36.000000000 +0200
+++ aMule-2.1.3/src/ED2KLinkParser.cpp 2008-04-08 15:47:16.000000000 +0200
@@ -32,6 +32,7 @@ const int versionRevision = 1;
#include <sstream>
#include <iostream>
#include <fstream>
+#include <cstdlib>
#ifdef __APPLE__
#include <CoreServices/CoreServices.h>
aMule-2.1.3-multiple.patch:
--- NEW FILE aMule-2.1.3-multiple.patch ---
diff -up aMule-2.1.3/src/ExternalConnector.h.multiple aMule-2.1.3/src/ExternalConnector.h
--- aMule-2.1.3/src/ExternalConnector.h.multiple 2008-04-08 15:33:04.000000000 +0200
+++ aMule-2.1.3/src/ExternalConnector.h 2008-04-08 15:38:22.000000000 +0200
@@ -143,7 +143,7 @@ public:
bool Parse_Command(const wxString& buffer);
void GetCommand(const wxString &prompt, char* buffer, size_t buffer_size);
const CECPacket *SendRecvMsg_v2(const CECPacket *request) { return m_ECClient->SendRecvPacket(request); }
- void ConnectAndRun(const wxString &ProgName, const wxString& ProgName);
+ void ConnectAndRun(const wxString &ProgName, const wxString& ProgVersion);
void ShowGreet();
//
aMule-2.1.3-ocreate.patch:
--- NEW FILE aMule-2.1.3-ocreate.patch ---
diff -up aMule-2.1.3/src/FileFunctions.cpp.ocreate aMule-2.1.3/src/FileFunctions.cpp
--- aMule-2.1.3/src/FileFunctions.cpp.ocreate 2008-04-08 03:27:56.000000000 +0200
+++ aMule-2.1.3/src/FileFunctions.cpp 2008-04-08 03:32:13.000000000 +0200
@@ -599,7 +599,7 @@ FSCheckResult DoCheckFileSystem(const wx
wxString fullName = JoinPaths(path, wxT(":"));
// Try to open the file, without overwriting existing files.
- int fd = open(fullName.fn_str(), O_WRONLY | O_CREAT | O_EXCL);
+ int fd = open(fullName.fn_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
if (fd != -1) {
// Success, the file-system cant be FAT32
close(fd);
aMule-wx-1.2.patch:
--- NEW FILE aMule-wx-1.2.patch ---
diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16 13:09:29.000000000 +0100
+++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17 20:20:47.151203000 +0100
@@ -297,7 +297,7 @@
m_validateButton =
new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
m_cancelButton =
- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
+ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
@@ -321,7 +321,6 @@
EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog
EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
END_EVENT_TABLE ()
--- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250 +0100
+++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250 +0100
@@ -101,8 +101,7 @@
ID_AUTOSTATIMG_COMBO,
ID_AUTOSTATIMG_BROWSE_BUTTON,
ID_FTP_UPDATE_CHECK,
- ID_VALIDATE_BUTTON,
- ID_CANCEL_BUTTON
+ ID_VALIDATE_BUTTON
};
protected:
--- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100
+++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100
@@ -24,7 +24,6 @@
#include <wx/mstream.h>
#include <wx/gifdecod.h>
-#include <wx/window.h>
#include <wx/dcbuffer.h>
#include "MuleGifCtrl.h"
@@ -35,6 +34,50 @@
EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
END_EVENT_TABLE()
+#if wxCHECK_VERSION(2, 7, 1)
+// Wrapper that emulates old wxGIFDecoder API
+
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+ MuleGIFDecoder(wxInputStream* stream, bool dummy) {
+ m_stream = stream;
+ dummy = dummy; // Unused.
+ m_nframe = 0;
+ }
+
+ ~MuleGIFDecoder() { /* don't delete the stream! */ }
+
+ wxGIFErrorCode ReadGIF() {
+ return LoadGIF(*m_stream);
+ }
+
+ void GoFirstFrame() { m_nframe = 0; }
+ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
+ void GoLastFrame() { m_nframe = GetFrameCount(); }
+
+ void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
+
+ size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
+ size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
+
+ size_t GetLeft() { return 0; }
+ size_t GetTop() { return 0; }
+
+ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
+
+private:
+ uint32_t m_nframe;
+ wxInputStream* m_stream;
+};
+
+#else
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+ MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
+};
+#endif
+
+
MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, long style, const wxValidator& validator,
@@ -66,7 +109,7 @@
}
wxMemoryInputStream stream(data, size);
- m_decoder = new wxGIFDecoder(&stream, TRUE);
+ m_decoder = new MuleGIFDecoder(&stream, TRUE);
if ( m_decoder->ReadGIF() != wxGIF_OK ) {
delete m_decoder;
m_decoder = NULL;
@@ -137,3 +180,4 @@
dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
}
+// File_checked_for_headers
--- aMule/src/MuleGifCtrl.h 2006-01-01 06:17:25.000000000 +0100
+++ aMule/src/MuleGifCtrl.h 2006-11-18 05:01:22.000000000 +0100
@@ -27,11 +27,10 @@
#include <wx/control.h>
#include <wx/timer.h>
-#include <wx/bitmap.h>
const int GIFTIMERID = 271283;
-class wxGIFDecoder;
+class MuleGIFDecoder;
class wxBitmap;
/**
@@ -121,7 +120,7 @@
void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
//! A pointer to the current gif-animation.
- wxGIFDecoder* m_decoder;
+ MuleGIFDecoder* m_decoder;
//! Timer used for the delay between each frame.
wxTimer m_timer;
//! Current frame.
@@ -133,3 +132,4 @@
#endif
+// File_checked_for_headers
--- aMule-2.1.3/src/MuleTextCtrl.cpp~ 2006-12-17 20:55:37.157820250 +0100
+++ aMule-2.1.3/src/MuleTextCtrl.cpp 2006-12-17 20:56:21.328580750 +0100
@@ -26,6 +26,7 @@
#include <wx/menu.h>
#include <wx/intl.h>
#include <wx/clipbrd.h>
+#include <wx/dataobj.h>
/**
* These are the IDs used to identify the different menu-items.
--- amule/src/amule.cpp~ 2006-12-17 21:53:26.474639000 +0100
+++ amule/src/amule.cpp 2006-12-17 21:55:40.307003000 +0100
@@ -96,6 +96,7 @@
#include <CoreFoundation/CFBundle.h>
#include <wx/mac/corefoundation/cfstring.h>
#endif
+ #include <wx/msgdlg.h>
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:47:16 -0000 1.1
+++ .cvsignore 3 Aug 2008 17:27:48 -0000 1.2
@@ -0,0 +1 @@
+aMule-2.1.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:47:16 -0000 1.1
+++ sources 3 Aug 2008 17:27:48 -0000 1.2
@@ -0,0 +1 @@
+0aafdd159edb8ad5f0064da87998b47d aMule-2.1.3.tar.bz2
16 years, 3 months
- 1
- 0