rpms/nomadsync/devel nomadsync-libnjbloc64.patch, NONE, 1.1 nomadsync.spec, 1.2, 1.3
Linus Walleij (snirkel)
fedora-extras-commits at redhat.com
Mon Mar 13 20:47:03 UTC 2006
- Previous message (by thread): rpms/adime/devel adime-2.2.1-so-fixes.patch, NONE, 1.1 adime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): comps comps-fe5.xml.in,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: snirkel
Update of /cvs/extras/rpms/nomadsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15740
Modified Files:
nomadsync.spec
Added Files:
nomadsync-libnjbloc64.patch
Log Message:
Don't think this will work on devel but need to bump anyway.
nomadsync-libnjbloc64.patch:
--- NEW FILE nomadsync-libnjbloc64.patch ---
--- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100
+++ src/Makefile.in 2006-03-13 07:54:27.000000000 +0100
@@ -67,7 +67,7 @@
layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \
mpg123.$(OBJEXT)
nomadsync_OBJECTS = $(am_nomadsync_OBJECTS)
-nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so
+nomadsync_DEPENDENCIES = /usr/lib64/libnjb.so
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -226,7 +226,7 @@
libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \
libmpg123/mpg123.cpp libmpg123/mpg123.h
-nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3
+nomadsync_LDADD = /usr/lib64/libnjb.so -lid3
AM_CXXFLAGS = `gtk-config --cflags`
# this is where the desktop file will go
Index: nomadsync.spec
===================================================================
RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nomadsync.spec 12 Mar 2006 21:56:38 -0000 1.2
+++ nomadsync.spec 13 Mar 2006 20:47:03 -0000 1.3
@@ -12,14 +12,14 @@
Name: nomadsync
Version: 0.4.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A music synchronization program form portable audio players
URL: http://nomadsync.sourceforge.net/
-
Group: Applications/Multimedia
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Patch0: nomadsync-libnjbloc.patch
+Patch1: nomadsync-libnjbloc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL
Requires(post): desktop-file-utils
@@ -39,7 +39,11 @@
%prep
%setup -q -n %{name}
+%if "%{_arch}" == "x86_64"
+%patch1 -p0
+%else
%patch0 -p0
+%endif
%build
%configure --with-wx-config=%{_bindir}/wxgtk-2.4-config
@@ -85,6 +89,9 @@
%doc ChangeLog authors copying readme
%changelog
+* Mon Mar 13 2006 Linus Walleij <triad at df.lth.se> 0.4.2-10
+- Fixed a x86_64 bug, by separate patching, I think...
+
* Sun Mar 12 2006 Linus Walleij <triad at df.lth.se> 0.4.2-9
- Found a patchable bug during build tests.
- Previous message (by thread): rpms/adime/devel adime-2.2.1-so-fixes.patch, NONE, 1.1 adime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): comps comps-fe5.xml.in,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list