rpms/nomadsync/devel nomadsync-libnjbloc.patch, NONE, 1.1 nomadsync.spec, 1.1, 1.2
Linus Walleij (snirkel)
fedora-extras-commits at redhat.com
Sun Mar 12 21:56:38 UTC 2006
Author: snirkel
Update of /cvs/extras/rpms/nomadsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24789
Modified Files:
nomadsync.spec
Added Files:
nomadsync-libnjbloc.patch
Log Message:
Bugfinding in the new spec
nomadsync-libnjbloc.patch:
--- NEW FILE nomadsync-libnjbloc.patch ---
--- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100
+++ src/Makefile.in 2006-03-12 22:33:18.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/lib/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/lib/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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nomadsync.spec 9 Mar 2006 19:53:02 -0000 1.1
+++ nomadsync.spec 12 Mar 2006 21:56:38 -0000 1.2
@@ -12,13 +12,14 @@
Name: nomadsync
Version: 0.4.2
-Release: 8%{?dist}
+Release: 9%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL
Requires(post): desktop-file-utils
@@ -38,9 +39,10 @@
%prep
%setup -q -n %{name}
+%patch0 -p0
%build
-%configure
+%configure --with-wx-config=%{_bindir}/wxgtk-2.4-config
make %{?_smp_mflags}
%install
@@ -83,6 +85,9 @@
%doc ChangeLog authors copying readme
%changelog
+* Sun Mar 12 2006 Linus Walleij <triad at df.lth.se> 0.4.2-9
+- Found a patchable bug during build tests.
+
* Wed Mar 8 2006 Linus Walleij <triad at df.lth.se> 0.4.2-8
- New sources, do not re-tar the file.
More information about the fedora-extras-commits
mailing list