rpms/gmyth/devel .cvsignore, 1.4, 1.5 gmyth.spec, 1.6, 1.7 sources, 1.4, 1.5

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gmyth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25395

Modified Files:
	.cvsignore gmyth.spec sources 
Log Message:
* Sun May 18 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-3
- Add gmyth-upnp to the package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Mar 2008 14:33:28 -0000	1.4
+++ .cvsignore	18 May 2008 14:20:32 -0000	1.5
@@ -1 +1,2 @@
 gmyth-0.7.1.tar.gz
+gmyth-upnp_0.7-indt1.tar.gz


Index: gmyth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/gmyth.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gmyth.spec	3 Mar 2008 16:15:33 -0000	1.6
+++ gmyth.spec	18 May 2008 14:20:32 -0000	1.7
@@ -1,41 +1,57 @@
+%define gmyth_upnp_version 0.7-indt1
+
 Summary: MythTV remote access libraries
 Name: gmyth
 Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1: http://downloads.sourceforge.net/%{name}/gmyth-upnp_%{gmyth_upnp_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://gmyth.sf.net
-BuildRequires: mysql-devel curl-devel libxml2-devel glib2-devel
+BuildRequires: mysql-devel curl-devel libxml2-devel glib2-devel libupnp-devel
 
 %description
 GMyth is a library used by applications to access content provided by the
 MythTV set-top box framework, such as Live TV broadcasts, TV recordings, or
 TV listings.
 
+The package also includes GMyth-UPNP, used to discover MythTV servers using UPNP.
+
 %package devel
 Summary: Development libraries for MythTV remote access
 Group: Development/Libraries
 Requires: gmyth = %{version}-%{release}
-Requires: pkgconfig glib2-devel mysql-devel curl-devel
+Requires: pkgconfig glib2-devel mysql-devel curl-devel libupnp-devel
 
 %description devel
-gmyth-devel contains development libraries and headers for the GMyth library.
+gmyth-devel contains development libraries and headers for the GMyth and
+GMyth-UPNP libraries.
 
 %prep
 %setup -q
+tar xvzf %{SOURCE1}
 
 %build
 %configure
 make %{?_smp_mflags}
 chmod a-x gmyth/*.[ch]
 
+pushd gmyth-upnp
+CFLAGS=-I`pwd`/../ PKG_CONFIG_PATH=`pwd`/.. %configure
+make %{?_smp_mflags} LDFLAGS=-L`pwd`/../gmyth/.libs/
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+pushd gmyth-upnp
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+mv $RPM_BUILD_ROOT/%{_bindir}/test $RPM_BUILD_ROOT/%{_bindir}/gmyth-upnp-test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,14 +65,20 @@
 %doc AUTHORS COPYING
 %{_bindir}/*
 %{_libdir}/libgmyth.so.*
+%{_libdir}/libgmythupnp.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/gmyth
+%{_includedir}/gmyth_upnp.h
 %{_libdir}/libgmyth.so
+%{_libdir}/libgmythupnp.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun May 18 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-3
+- Add gmyth-upnp to the package
+
 * Mon Mar 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-2
 - Remove our own COPYING file, the upstream reports the right
   license now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2008 14:33:28 -0000	1.4
+++ sources	18 May 2008 14:20:32 -0000	1.5
@@ -1 +1,2 @@
 ab6b7525fd9c71cf5203f9e61abec0c3  gmyth-0.7.1.tar.gz
+29e58ea47e1548d70e4498cabca249a6  gmyth-upnp_0.7-indt1.tar.gz