rpms/libdvdnav/devel libdvdnav-multilib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 libdvdnav.spec, 1.15, 1.16 sources, 1.7, 1.8
Dominik Mierzejewski
rathann at fedoraproject.org
Sun Sep 27 00:14:40 UTC 2009
Author: rathann
Update of /cvs/pkgs/rpms/libdvdnav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19226
Modified Files:
.cvsignore libdvdnav.spec sources
Added Files:
libdvdnav-multilib.patch
Log Message:
* Sat Sep 26 2009 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.4-0.1.svn1184
- fix multilib conflict, based on a patch by Rex Dieter (rhbz#477684)
- update to SVN r1184
- move TODO to devel docs
libdvdnav-multilib.patch:
Makefile | 6 ------
misc/dvdnav-config2.sh | 12 ++++++------
2 files changed, 6 insertions(+), 12 deletions(-)
--- NEW FILE libdvdnav-multilib.patch ---
diff -up libdvdnav-4.1.3/Makefile.multilib libdvdnav-4.1.3/Makefile
--- libdvdnav-4.1.3/Makefile.multilib 2008-12-30 15:48:46.000000000 +0100
+++ libdvdnav-4.1.3/Makefile 2009-09-27 00:36:48.000000000 +0200
@@ -143,12 +143,6 @@ distclean: clean
dvdnav-config: $(.OBJDIR)/dvdnav-config
$(.OBJDIR)/dvdnav-config: $(BUILDDEPS)
@echo '#!/bin/sh' > $(.OBJDIR)/dvdnav-config
- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdnav-config
- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdnav-config
- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdnav-config
- @echo 'dvdread_cflags="'$(DVDREAD_CFLAGS)'"' >> $(.OBJDIR)/dvdnav-config
- @echo 'dvdread_libs="'$(DVDREAD_LIBS)'"' >> $(.OBJDIR)/dvdnav-config
- @echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config
@echo >> $(.OBJDIR)/dvdnav-config
cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config
chmod 0755 $(.OBJDIR)/dvdnav-config
diff -up libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib libdvdnav-4.1.3/misc/dvdnav-config2.sh
--- libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib 2008-10-10 00:20:01.000000000 +0200
+++ libdvdnav-4.1.3/misc/dvdnav-config2.sh 2009-09-27 00:34:39.000000000 +0200
@@ -30,7 +30,7 @@ while test $# -gt 0; do
echo_prefix=yes
;;
--version)
- echo $version
+ echo `pkg-config --modversion dvdnav`
;;
--cflags)
echo_cflags=yes
@@ -52,21 +52,21 @@ while test $# -gt 0; do
done
if test "$echo_prefix" = "yes"; then
- echo $prefix
+ echo `pkg-config --variable=prefix dvdnav`
fi
if test "$echo_cflags" = "yes"; then
- echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
+ echo `pkg-config --cflags dvdnav`
fi
if test "$echo_minicflags" = "yes"; then
- echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
+ echo `pkg-config --cflags dvdnavmini`
fi
if test "$echo_libs" = "yes"; then
- echo -L$libdir -ldvdnav $dvdread_libs $threadlib
+ echo `pkg-config --libs dvdnav`
fi
if test "$echo_minilibs" = "yes"; then
- echo -L$libdir -ldvdnavmini $threadlib
+ echo `pkg-config --libs dvdnavmini`
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 9 Sep 2008 17:51:27 -0000 1.7
+++ .cvsignore 27 Sep 2009 00:14:38 -0000 1.8
@@ -1 +1 @@
-libdvdnav-4.1.3.tar.bz2
+libdvdnav-svn1184.tar.bz2
Index: libdvdnav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/libdvdnav.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libdvdnav.spec 25 Jul 2009 05:32:23 -0000 1.15
+++ libdvdnav.spec 27 Sep 2009 00:14:38 -0000 1.16
@@ -1,13 +1,14 @@
Name: libdvdnav
-Version: 4.1.3
-Release: 3%{?dist}
+Version: 4.1.4
+Release: 0.1.svn1184%{?dist}
Summary: A library for reading DVD video discs based on Ogle code
Group: System Environment/Libraries
License: GPLv2+
-Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
+#Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.bz2
# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-#Source: %{name}-4.1.3rc1.tar.bz2
+Source: %{name}-svn1184.tar.bz2
+Patch0: %{name}-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
@@ -30,6 +31,7 @@ libdvdnav library.
%prep
%setup -q
+%patch0 -p1 -b .multilib
%build
./configure2 \
@@ -62,13 +64,13 @@ popd
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libdvdnav.so.*
%{_libdir}/libdvdnavmini.so.*
%files devel
%defattr(-,root,root,-)
-%doc doc/html/*
+%doc TODO doc/html/*
%{_bindir}/dvdnav-config
%{_libdir}/libdvdnav.so
%{_libdir}/libdvdnavmini.so
@@ -78,6 +80,11 @@ popd
%{_libdir}/pkgconfig/dvdnavmini.pc
%changelog
+* Sat Sep 26 2009 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.4-0.1.svn1184
+- fix multilib conflict, based on a patch by Rex Dieter (rhbz#477684)
+- update to SVN r1184
+- move TODO to devel docs
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdnav/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 9 Sep 2008 17:51:27 -0000 1.7
+++ sources 27 Sep 2009 00:14:38 -0000 1.8
@@ -1 +1 @@
-d62383c45b28816771e283515f2c27fa libdvdnav-4.1.3.tar.bz2
+9e25093d010e007145f7d220f6a3c595 libdvdnav-svn1184.tar.bz2
More information about the fedora-extras-commits
mailing list