From f038ac06daefaa3abfedcf3251707ce3671517e8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 17 Jan 2009 03:33:19 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for xtvd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 638ced27b7a60b490dfced0cdfe2237908312a29 Mon Sep 17 00:00:00 2001 From: Sandro Mathys Date: Mon, 26 Jan 2009 13:34:26 +0000 Subject: [PATCH 2/4] - initial commit --- .cvsignore | 1 + import.log | 1 + sources | 1 + xtvd.spec | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 import.log create mode 100644 xtvd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..0416d44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xtvd-2.0.1.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..2b051a4 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xtvd-2_0_1-2_fc11:F-10:xtvd-2.0.1-2.fc11.src.rpm:1232976834 diff --git a/sources b/sources index e69de29..6582073 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +bec29595844698245bf2f28660b35377 xtvd-2.0.1.tar.bz2 diff --git a/xtvd.spec b/xtvd.spec new file mode 100644 index 0000000..f287afe --- /dev/null +++ b/xtvd.spec @@ -0,0 +1,129 @@ +Name: xtvd +Version: 2.0.1 +Release: 2%{?dist} +Summary: A client java library for easy access to the tv data from schedulesdirect.org +Group: Development/Libraries +License: GPL+ +URL: http://xtvdclient.sourceforge.net/ +#svn co https://xtvdclient.svn.sourceforge.net/svnroot/xtvdclient/tags/2.0.1 xtvd-2.0.1 +Source0: %{name}-%{version}.tar.bz2 +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: jdom + +%description +A client java library for easy access to the tv data from schedulesdirect.org. + + +%package lib +Summary: A client java library for easy access to the tv data from schedulesdirect.org +Group: Development/Libraries +Requires: java >= 1:1.6.0 +Requires: jpackage-utils + +%description lib +A client java library for easy access to the tv data from schedulesdirect.org. + + +%package gui +Summary: This client is only a small demonstration for the usage of the library +Group: Applications/Multimedia +Requires: java >= 1:1.6.0 +Requires: jpackage-utils +Requires: %{name}-lib = %{version}-%{release} + +%description gui +This client is only a small demonstration for the usage of the library. +It's an enhanced verison of the old XTVD WEBSERVICE CLIENT by Tribune +Media Services, Inc. + + +%package lib-javadoc +Summary: Javadocs for xtvd-lib +Group: Documentation +Requires: %{name}-lib = %{version}-%{release} +Requires: jpackage-utils + +%description lib-javadoc +xtvd-lib development documentation. + + +%prep +%setup -q # -n %{name}-%{version} + +%build +# lib +pushd %{name}-lib +rm -rf target +mkdir target +javac -d target `find -name '*.java'` + +jar -cf ../%{name}-lib-%{version}.jar -C target . + +# lib-javadoc +javadoc -d doc `find src -name '*.java'` + +popd + + +# gui +pushd %{name}-gui +rm -rf target +mkdir target +javac -d target -cp ../%{name}-lib-%{version}.jar:`build-classpath jdom` `find -name '*.java'` +jar -cf ../%{name}-gui-%{version}.jar -C target . +popd + + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_javadir} + +# lib +install -m644 %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib-%{version}.jar +ln -s %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib.jar + +# gui +install -m644 %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui-%{version}.jar +ln -s %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui.jar + +# lib-javadoc +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -rp %{name}-lib/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files lib +%defattr(-,root,root,-) +%doc %{name}-lib/LICENSE +%{_javadir}/%{name}-lib.jar +%{_javadir}/%{name}-lib-%{version}.jar + +%files gui +%defattr(-,root,root,-) +%doc %{name}-gui/LICENSE +%{_javadir}/%{name}-gui.jar +%{_javadir}/%{name}-gui-%{version}.jar + +%files lib-javadoc +%defattr(-,root,root,-) +%dir %{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} +%{_javadocdir}/%{name}-%{version}/* + +%changelog +* Thu Dec 18 2008 Sandro Mathys - 2.0.1-2 +- For the javac call, the classpath is no longer hardcoded with the + absolute paths to the javadir (currently that's only jdom). Instead, + build-classpath is used. + +* Tue Dec 16 2008 Sandro Mathys - 2.0.1-1 +- initial build From cea1aed93588f5c1cd6e3e9fd2de3d73cd0000d0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:35 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6c0b650..aeb3d88 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xtvd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From abe4ecc2d9215583b016bff01ecbe767c90bde6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:15:00 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index aeb3d88..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xtvd -# $Id$ -NAME := xtvd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 diff --git a/import.log b/import.log deleted file mode 100644 index 2b051a4..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xtvd-2_0_1-2_fc11:F-10:xtvd-2.0.1-2.fc11.src.rpm:1232976834