rpms/xmms2-freeworld/devel xmms2-0.7DrNo-moresaneversioning.patch,
NONE, 1.1 xmms2-0.7DrNo-no-O0.patch, NONE,
1.1 xmms2-0.7DrNo-use-libdir.patch, NONE, 1.1 .cvsignore, 1.3,
1.4 sources, 1.3, 1.4 xmms2-freeworld.spec, 1.3,
1.4 xmms2-0.5DrLecter-no-O0.patch, 1.1,
NONE xmms2-0.6DrMattDestruction-moresaneversioning.patch, 1.1,
NONE xmms2-0.6DrMattDestruction-use-libdir.patch, 1.1, NONE
Orcan Ogetbil
oget at rpmfusion.org
Fri Jul 2 01:49:09 CEST 2010
- Previous message: rpms/vlc/devel .cvsignore, 1.28, 1.29 sources, 1.34, 1.35 vlc.spec,
1.84, 1.85
- Next message: rpms/xmms2-nonfree/devel xmms2-0.7DrNo-moresaneversioning.patch,
NONE, 1.1 xmms2-0.7DrNo-no-O0.patch, NONE,
1.1 xmms2-0.7DrNo-use-libdir.patch, NONE, 1.1 .cvsignore, 1.3,
1.4 sources, 1.3, 1.4 xmms2-nonfree.spec, 1.5,
1.6 xmms2-0.5DrLecter-no-O0.patch, 1.1,
NONE xmms2-0.6DrMattDestruction-moresaneversioning.patch, 1.1,
NONE xmms2-0.6DrMattDestruction-use-libdir.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: oget
Update of /cvs/free/rpms/xmms2-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10556
Modified Files:
.cvsignore sources xmms2-freeworld.spec
Added Files:
xmms2-0.7DrNo-moresaneversioning.patch
xmms2-0.7DrNo-no-O0.patch xmms2-0.7DrNo-use-libdir.patch
Removed Files:
xmms2-0.5DrLecter-no-O0.patch
xmms2-0.6DrMattDestruction-moresaneversioning.patch
xmms2-0.6DrMattDestruction-use-libdir.patch
Log Message:
* Thu Jul 01 2010 John Doe <anonymous at american.us> 0.7-1
- Update to 0.7
xmms2-0.7DrNo-moresaneversioning.patch:
wscript | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
--- NEW FILE xmms2-0.7DrNo-moresaneversioning.patch ---
diff -up xmms2-0.7DrNo/wscript.versionsanity xmms2-0.7DrNo/wscript
--- xmms2-0.7DrNo/wscript.versionsanity 2010-04-13 17:50:25.000000000 -0400
+++ xmms2-0.7DrNo/wscript 2010-04-13 17:51:34.272674113 -0400
@@ -23,7 +23,7 @@ import Build
import Configure
from logging import fatal, warning
-BASEVERSION="0.7 DrNo"
+BASEVERSION="0.7"
APPNAME='xmms2'
srcdir='.'
@@ -266,14 +266,15 @@ def configure(conf):
nam,changed = gittools.get_info()
conf.check_message("git commit id", "", True, nam)
- if Options.options.customversion:
- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
- else:
- dirty=""
- if changed:
- dirty="-dirty"
- conf.check_message("uncommitted changes", "", bool(changed))
- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
+ ## if Options.options.customversion:
+ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
+ ## else:
+ ## dirty=""
+ ## if changed:
+ ## dirty="-dirty"
+ ## conf.check_message("uncommitted changes", "", bool(changed))
+ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
+ conf.env["VERSION"] = BASEVERSION
## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
for warning in ('all',
xmms2-0.7DrNo-no-O0.patch:
wscript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE xmms2-0.7DrNo-no-O0.patch ---
diff -up xmms2-0.7DrNo/wscript.noO0 xmms2-0.7DrNo/wscript
--- xmms2-0.7DrNo/wscript.noO0 2010-02-19 12:43:54.000000000 -0500
+++ xmms2-0.7DrNo/wscript 2010-04-13 17:49:15.351789069 -0400
@@ -275,7 +275,7 @@ def configure(conf):
conf.check_message("uncommitted changes", "", bool(changed))
conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
- conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
+ ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
for warning in ('all',
'no-format-extra-args',
'no-format-zero-length',
@@ -295,7 +295,7 @@ def configure(conf):
# autogenerate uselib definitions to disable warnings
conf.env["CCFLAGS_NO%s" % warning.replace("-","").upper()] = ["-Wno-%s" % warning]
- conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
+ ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
conf.env['XMMS_PKGCONF_FILES'] = []
conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
xmms2-0.7DrNo-use-libdir.patch:
wafadmin/Tools/gnu_dirs.py | 2 +-
wafadmin/Tools/libtool.py | 4 ++--
wafadmin/Tools/python.py | 7 ++-----
waftools/tool.py | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
--- NEW FILE xmms2-0.7DrNo-use-libdir.patch ---
diff -up xmms2-0.7DrNo/src/include/xmms/wscript.plugins-use-libdir xmms2-0.7DrNo/src/include/xmms/wscript
diff -up xmms2-0.7DrNo/wafadmin/Tools/ccroot.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/ccroot.py
diff -up xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py
diff -up xmms2-0.7DrNo/wafadmin/Tools/libtool.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/libtool.py
--- xmms2-0.7DrNo/wafadmin/Tools/libtool.py.plugins-use-libdir 2010-02-19 12:43:54.000000000 -0500
+++ xmms2-0.7DrNo/wafadmin/Tools/libtool.py 2010-04-13 17:45:12.718672360 -0400
@@ -45,7 +45,7 @@ def fakelibtool_build(task):
fu("current=0\n")
fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n")
fu("dlopen=''\ndlpreopen=''\n")
- fu("libdir='%s/lib'\n" % env['PREFIX'])
+ fu("libdir='%s'\n" % env['LIBDIR'])
dest.close()
return 0
@@ -71,7 +71,7 @@ def apply_link_libtool(self):
self.latask = self.create_task('fakelibtool', linktask.outputs, linktask.outputs[0].change_ext('.la'))
if self.bld.is_install:
- self.bld.install_files('${PREFIX}/lib', linktask.outputs[0], self.env)
+ self.bld.install_files('${LIBDIR}', linktask.outputs[0], self.env)
@feature("libtool")
@before('apply_core')
diff -up xmms2-0.7DrNo/waftools/tool.py.plugins-use-libdir xmms2-0.7DrNo/waftools/tool.py
--- xmms2-0.7DrNo/waftools/tool.py.plugins-use-libdir 2010-02-19 12:43:54.000000000 -0500
+++ xmms2-0.7DrNo/waftools/tool.py 2010-04-13 17:40:40.215663210 -0400
@@ -6,5 +6,5 @@ def add_install_flag(bld, obj):
if env['explicit_install_name']:
libname = obj.env["shlib_PATTERN"] % obj.target
- insname = os.path.join(obj.env["PREFIX"], 'lib', libname)
+ insname = os.path.join(obj.env["LIBDIR"], libname)
obj.env.append_unique("LINKFLAGS", '-install_name ' + insname)
--- xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py.plugins-use-libdir 2010-04-13 18:02:40.858675994 -0400
+++ xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py 2010-04-13 18:03:01.201810629 -0400
@@ -44,7 +44,7 @@ libexecdir, program executables, ${EXEC_
sysconfdir, read-only single-machine data, ${PREFIX}/etc
sharedstatedir, modifiable architecture-independent data, ${PREFIX}/com
localstatedir, modifiable single-machine data, ${PREFIX}/var
-libdir, object code libraries, ${EXEC_PREFIX}/lib
+libdir, object code libraries, ${LIBDIR}
includedir, C header files, ${PREFIX}/include
oldincludedir, C header files for non-gcc, /usr/include
datarootdir, read-only arch.-independent data root, ${PREFIX}/share
--- xmms2-0.7DrNo/wafadmin/Tools/python.py.plugins-use-libdir 2010-04-13 18:15:49.402785506 -0400
+++ xmms2-0.7DrNo/wafadmin/Tools/python.py 2010-04-13 18:22:03.243800732 -0400
@@ -342,13 +342,10 @@
python_LIBDEST = None
(pydir,) = \
_get_python_variables(python,
- ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+ ["get_python_lib(1)"],
['from distutils.sysconfig import get_config_var, get_python_lib'])
if python_LIBDEST is None:
- if conf.env['LIBDIR']:
- python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
- else:
- python_LIBDEST = os.path.join(conf.env['PREFIX'], "lib", "python" + pyver)
+ python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
if hasattr(conf, 'define'): # conf.define is added by the C tool, so may not exist
conf.define('PYTHONDIR', pydir)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 Aug 2009 09:39:19 -0000 1.3
+++ .cvsignore 1 Jul 2010 23:49:09 -0000 1.4
@@ -1 +1 @@
-xmms2-0.6DrMattDestruction.tar.bz2
+xmms2-0.7DrNo.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 Aug 2009 09:39:19 -0000 1.3
+++ sources 1 Jul 2010 23:49:09 -0000 1.4
@@ -1 +1 @@
-954fb9c76b5db5e324a105e81b273200 xmms2-0.6DrMattDestruction.tar.bz2
+60e50b591078acb6a85cd83de0f2b077 xmms2-0.7DrNo.tar.bz2
Index: xmms2-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms2-freeworld.spec 12 Aug 2009 09:39:19 -0000 1.3
+++ xmms2-freeworld.spec 1 Jul 2010 23:49:09 -0000 1.4
@@ -1,20 +1,20 @@
-%define codename DrMattDestruction
+%define codename DrNo
Name: xmms2-freeworld
Summary: Plugins for XMMS2 that cannot be included in Fedora
-Version: 0.6
+Version: 0.7
Release: 1%{?dist}
License: LGPLv2+ and GPL+ and BSD
Group: Applications/Multimedia
# Fedora's xmms2 has to use a sanitized tarball, we don't.
Source0: http://downloads.sourceforge.net/xmms2/xmms2-%{version}%{codename}.tar.bz2
# Use libdir properly for Fedora multilib
-Patch1: xmms2-0.6DrMattDestruction-use-libdir.patch
+Patch1: xmms2-0.7DrNo-use-libdir.patch
# Don't add extra CFLAGS, we're smart enough, thanks.
-Patch4: xmms2-0.5DrLecter-no-O0.patch
+Patch4: xmms2-0.7DrNo-no-O0.patch
# More sane versioning
-Patch5: xmms2-0.6DrMattDestruction-moresaneversioning.patch
+Patch5: xmms2-0.7DrNo-moresaneversioning.patch
URL: http://wiki.xmms2.xmms.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -109,7 +109,7 @@
%build
export CFLAGS="%{optflags}"
./waf configure --prefix=%{_prefix} \
- --with-libdir=%{_libdir} \
+ --libdir=%{_libdir} \
--with-pkgconfigdir=%{_libdir}/pkgconfig \
--without-optionals=avahi \
--without-optionals=cli \
@@ -175,7 +175,7 @@
%install
rm -rf %{buildroot}
-./waf install --destdir=%{buildroot} --prefix=%{_prefix} --with-libdir=%{_libdir} --with-pkgconfigdir=%{_libdir}/pkgconfig
+./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-pkgconfigdir=%{_libdir}/pkgconfig
# There are lots of things that get built that we don't need to package, because they're in the Fedora xmms2 package.
rm -rf %{buildroot}%{_bindir} %{buildroot}%{_libdir}/libxmmsclient* %{buildroot}%{_mandir} %{buildroot}%{_datadir} %{buildroot}%{_includedir} %{buildroot}%{_libdir}/pkgconfig
@@ -216,6 +216,9 @@
%{_libdir}/xmms2/libxmms_mp4.so
%changelog
+* Thu Jul 01 2010 John Doe <anonymous at american.us> 0.7-1
+- Update to 0.7
+
* Wed Aug 12 2009 John Doe <anonymous at american.us> 0.6-1
- Update to 0.6
--- xmms2-0.5DrLecter-no-O0.patch DELETED ---
--- xmms2-0.6DrMattDestruction-moresaneversioning.patch DELETED ---
--- xmms2-0.6DrMattDestruction-use-libdir.patch DELETED ---
- Previous message: rpms/vlc/devel .cvsignore, 1.28, 1.29 sources, 1.34, 1.35 vlc.spec,
1.84, 1.85
- Next message: rpms/xmms2-nonfree/devel xmms2-0.7DrNo-moresaneversioning.patch,
NONE, 1.1 xmms2-0.7DrNo-no-O0.patch, NONE,
1.1 xmms2-0.7DrNo-use-libdir.patch, NONE, 1.1 .cvsignore, 1.3,
1.4 sources, 1.3, 1.4 xmms2-nonfree.spec, 1.5,
1.6 xmms2-0.5DrLecter-no-O0.patch, 1.1,
NONE xmms2-0.6DrMattDestruction-moresaneversioning.patch, 1.1,
NONE xmms2-0.6DrMattDestruction-use-libdir.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list