rpms/libdvdread/devel libdvdread-4.1.3-multilib.patch, NONE, 1.1 libdvdread.spec, 1.9, 1.10

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libdvdread/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27136

Modified Files:
	libdvdread.spec 
Added Files:
	libdvdread-4.1.3-multilib.patch 
Log Message:
* Sat Jun 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.3-3
- fix multilib conflict (#477687)
- -devel: Requires: pkgconfig%{?_isa}


libdvdread-4.1.3-multilib.patch:

--- NEW FILE libdvdread-4.1.3-multilib.patch ---
diff -up libdvdread-4.1.3/Makefile.multilib libdvdread-4.1.3/Makefile
--- libdvdread-4.1.3/Makefile.multilib	2008-08-31 04:27:37.000000000 -0500
+++ libdvdread-4.1.3/Makefile	2009-06-27 20:50:40.149705039 -0500
@@ -130,11 +130,11 @@ distclean: clean
 
 dvdread-config: $(.OBJDIR)/dvdread-config
 $(.OBJDIR)/dvdread-config: $(BUILDDEPS)
-	@echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
-	@echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
-	@echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
-	@echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
-	@echo >> $(.OBJDIR)/dvdread-config
+	echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
+	#echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
+	#echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
+	#echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
+	echo >> $(.OBJDIR)/dvdread-config
 	cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
 	chmod 0755 $(.OBJDIR)/dvdread-config
 
diff -up libdvdread-4.1.3/misc/dvdread-config.sh.multilib libdvdread-4.1.3/misc/dvdread-config.sh
--- libdvdread-4.1.3/misc/dvdread-config.sh.multilib	2008-04-19 15:18:35.000000000 -0500
+++ libdvdread-4.1.3/misc/dvdread-config.sh	2009-06-27 20:49:36.676703194 -0500
@@ -1,4 +1,3 @@
-dvdreadlib="-ldvdread"
 
 usage()
 {
@@ -28,7 +27,7 @@ while test $# -gt 0; do
       echo_prefix=yes
       ;;
     --version)
-      echo $version
+      echo `pkg-config --modversion dvdread` 
       ;;
     --cflags)
       echo_cflags=yes
@@ -44,13 +43,13 @@ while test $# -gt 0; do
 done
 
 if test "$echo_prefix" = "yes"; then
-	echo $prefix
+      echo `pkg-config --variable=prefix dvdread`
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I$prefix/include $extracflags
+      echo `pkg-config --cflags dvdread` 
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L$libdir $dvdreadlib
+      echo `pkg-config --libs dvdread` 
 fi      


Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/devel/libdvdread.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libdvdread.spec	25 Feb 2009 14:27:45 -0000	1.9
+++ libdvdread.spec	28 Jun 2009 01:55:48 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        4.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
@@ -10,6 +10,10 @@ Source:         http://www.mplayerhq.hu/
 #Source:         %{name}-4.1.3rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# dvdread-config: use pkg-config instead of hard-coded 
+# multilib-conflicting values
+Patch1: libdvdread-4.1.3-multilib.patch
+
 %description
 libdvdread provides a simple foundation for reading DVD video disks.
 It provides the functionality that is required to access many DVDs.
@@ -18,7 +22,7 @@ It provides the functionality that is re
 Summary:        Development files for libdvdread
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires:       pkgconfig%{?_isa}
 
 %description    devel
 libdvdread provides a simple foundation for reading DVD video disks.
@@ -29,6 +33,8 @@ This package contains development files 
 %prep
 %setup -q
 
+%patch1 -p1 -b .multilib
+
 %build
 ./configure2 \
  --disable-opts \
@@ -64,6 +70,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dvdread.pc
 
 %changelog
+* Sat Jun 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.3-3
+- fix multilib conflict (#477687)
+- -devel: Requires: pkgconfig%%{?_isa}
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild