[vdr] Various minor vdr.pc improvements.

[Ville Skyttä]

commit 6c0c17c6ace51e81ac98e92e65500a67c4ddc098
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Oct 17 23:42:39 2010 +0300

    Various minor vdr.pc improvements.

 vdr-1.6.0-fedora-pkgconfig.patch   |    5 ++---
 vdr-1.6.0-includes+pkgconfig.patch |    6 +++---
 vdr.spec                           |    7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/vdr-1.6.0-fedora-pkgconfig.patch b/vdr-1.6.0-fedora-pkgconfig.patch
index 494dc88..287cd58 100644
--- a/vdr-1.6.0-fedora-pkgconfig.patch
+++ b/vdr-1.6.0-fedora-pkgconfig.patch
@@ -1,6 +1,6 @@
 --- Makefile~	2008-09-15 19:05:56.000000000 +0300
 +++ Makefile	2008-09-15 19:06:26.000000000 +0300
-@@ -115,6 +115,14 @@
+@@ -115,6 +115,13 @@
  	echo "localedir=$(LOCDIR)" >> $@
  	echo "apiversion=$(APIVERSION)" >> $@
  	echo "" >> $@
@@ -8,10 +8,9 @@
 +	echo "cachedir=$(CACHEDIR)" >> $@
 +	echo "rundir=$(RUNDIR)" >> $@
 +	echo "vardir=$(VARDIR)" >> $@
-+	echo "logdir=$(LOGDIR)" >> $@
 +	echo "user=$(VDR_USER)" >> $@
 +	echo "group=$(VDR_GROUP)" >> $@
 +	echo "" >> $@
  	echo "Name: VDR" >> $@
  	echo "Description: Video Disk Recorder" >> $@
- 	echo "URL: http://www.cadsoft.de/vdr/" >> $@
+ 	echo "URL: http://www.tvdr.de/" >> $@
diff --git a/vdr-1.6.0-includes+pkgconfig.patch b/vdr-1.6.0-includes+pkgconfig.patch
index c9aa474..13ec932 100644
--- a/vdr-1.6.0-includes+pkgconfig.patch
+++ b/vdr-1.6.0-includes+pkgconfig.patch
@@ -12,7 +12,7 @@
  DOXYGEN  = /usr/bin/doxygen
  DOXYFILE = Doxyfile
  
-+PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(PREFIX)/lib/pkgconfig))
++PCDIR   ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig))
 +
  -include Make.config
  
@@ -43,9 +43,9 @@
 +	echo "" >> $@
 +	echo "Name: VDR" >> $@
 +	echo "Description: Video Disk Recorder" >> $@
-+	echo "URL: http://www.cadsoft.de/vdr/" >> $@
++	echo "URL: http://www.tvdr.de/" >> $@
 +	echo "Version: $(VDRVERSION)" >> $@
-+	echo "Cflags: $(CXXFLAGS) -I$${includedir}" >> $@
++	echo "Cflags: $(CXXFLAGS) $(DEFINES) -I\$${includedir}" >> $@
 +
  # Internationalization (I18N):
  
diff --git a/vdr.spec b/vdr.spec
index 7671883..f7c53df 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -333,9 +333,9 @@ install -dm 755 $RPM_BUILD_ROOT%{_bindir}
 install -pm 755 svdrpsend.pl $RPM_BUILD_ROOT%{_bindir}/svdrpsend
 install -pm 755 epg2html.pl $RPM_BUILD_ROOT%{_bindir}/epg2html
 
-export PKG_CONFIG_PATH=.
-make install-i18n install-includes install-pc install-doc \
-    PCDIR=%{_libdir}/pkgconfig DESTDIR=$RPM_BUILD_ROOT
+make install-pc DESTDIR=$RPM_BUILD_ROOT
+PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \
+make install-i18n install-includes install-doc DESTDIR=$RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
 install -pm 644 *.conf $RPM_BUILD_ROOT%{configdir}
@@ -545,6 +545,7 @@ fi
 * Sun Oct 17 2010 Ville Skyttä <ville.skytta at iki.fi>
 - Add vdr user to the cdrom group, drop related console.perms example.
 - Update VDR_PLUGIN_ORDER in sysconfig.
+- Various minor vdr.pc improvements.
 
 * Thu Jul  8 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-33
 - Include COPYING in -docs.