rpms/hdhomerun/devel hdhomerun-honor-destdir.patch, NONE, 1.1 hdhomerun.spec, 1.8, 1.9

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	hdhomerun.spec 
Added Files:
	hdhomerun-honor-destdir.patch 
Log Message:
* Tue Jun 23 2009 Jarod Wilson <jarod at redhat.com> 0.0-0.10.20090415
- Update to 20090415 release
- Add new GTK2 config GUI


hdhomerun-honor-destdir.patch:

--- NEW FILE hdhomerun-honor-destdir.patch ---
Index: hdhomerun_config_gui/src/Makefile.am
===================================================================
--- hdhomerun_config_gui.orig/src/Makefile.am
+++ hdhomerun_config_gui/src/Makefile.am
@@ -19,7 +19,7 @@ hdhomerun_config_gui_SOURCES = \
 	HDHRConfig.cpp HDHRConfig.h
 
 install-exec-local:
-	$(INSTALL) ../../libhdhomerun/libhdhomerun.so $(libdir)
+	$(INSTALL) ../../libhdhomerun/libhdhomerun.so $(DESTDIR)$(libdir)/
 	
 hdhomerun_config_gui_LDADD = \
 	-L../../libhdhomerun -lhdhomerun \
Index: hdhomerun_config_gui/src/Makefile.in
===================================================================
--- hdhomerun_config_gui.orig/src/Makefile.in
+++ hdhomerun_config_gui/src/Makefile.in
@@ -40,7 +40,7 @@ am__configure_deps = $(am__aclocal_m4_de
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_hdhomerun_config_gui_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) \
@@ -231,6 +231,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -361,7 +362,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -462,7 +463,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-local:
-	$(INSTALL) ../../libhdhomerun/libhdhomerun.so $(libdir)
+	$(INSTALL) ../../libhdhomerun/libhdhomerun.so $(DESTDIR)$(libdir)/
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


Index: hdhomerun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdhomerun/devel/hdhomerun.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hdhomerun.spec	25 Feb 2009 03:32:53 -0000	1.8
+++ hdhomerun.spec	26 Jun 2009 14:26:37 -0000	1.9
@@ -1,49 +1,66 @@
-%define		releasedate 20081002
+%define		releasedate 20090415
 Name:		hdhomerun
 Version:	0.0
-Release:	0.9.%{releasedate}%{?dist}
+Release:	0.10.%{releasedate}%{?dist}
 Summary:	Silicon Dust HDHomeRun configuration utility
 
 Group:		Applications/System
-License:	LGPLv3
+License:	LGPLv3 and GPLv3
 URL:		http://www.silicondust.com/
 Source0:	http://download.silicondust.com/hdhomerun/libhdhomerun_%{releasedate}.tgz
+Source1:        http://download.silicondust.com/hdhomerun/hdhomerun_config_gui_%{releasedate}.tgz
+Patch1:         hdhomerun-honor-destdir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  gtk2-devel
+Requires:       gtk2
 
 %description
 The configuration and firmware upgrade utility for Silicon Dust's
 networked HDTV dual-tuner HDHomeRun device.
 
 %prep
-%setup -q -n libhdhomerun
+%setup -q -c -a 1
+cd hdhomerun_config_gui
+%patch1 -p1
+cd ..
 # Fix up linefeeds, drop execute bit and don't strip binaries
-%{__sed} -i 's/\r//' *
-%{__chmod} -x *
-%{__sed} -i -e '/strip/d' -e 's/C\(PP\)\?FLAGS .=/C\1FLAGS ?=/' Makefile
+%{__sed} -i 's/\r//' libhdhomerun/*
+%{__chmod} -x libhdhomerun/*
+%{__sed} -i -e '/$(STRIP).*/d' -e 's/C\(PP\)\?FLAGS .=/C\1FLAGS ?=/' libhdhomerun/Makefile
 
 # Convert files to utf8
-for f in *; do
+for f in libhdhomerun/*; do
   /usr/bin/iconv -f iso-8859-1 -t utf-8 --output $f.new $f && mv $f.new $f
 done
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+cd hdhomerun_config_gui
+%configure
 make
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 hdhomerun_config $RPM_BUILD_ROOT%{_bindir}/
+make -C hdhomerun_config_gui install DESTDIR=$RPM_BUILD_ROOT
+install -m0755 libhdhomerun/hdhomerun_config $RPM_BUILD_ROOT%{_bindir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc lgpl.txt README
+%doc libhdhomerun/lgpl.txt libhdhomerun/README hdhomerun_config_gui/COPYING
+# lib and cli are LGPLv3
+%{_libdir}/libhdhomerun.so
 %{_bindir}/hdhomerun_config
+# gui is GPLv3
+%{_bindir}/hdhomerun_config_gui
 
 %changelog
+* Tue Jun 23 2009 Jarod Wilson <jarod at redhat.com> 0.0-0.10.20090415
+- Update to 20090415 release
+- Add new GTK2 config GUI
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0-0.9.20081002
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild