From a76b1cf62375890eedfedf342c9a30ff176dff16 Mon Sep 17 00:00:00 2001 From: John T. Guthrie III Date: Feb 02 2007 22:27:02 +0000 Subject: auto-import dxpc-3.9.1-0.1.b1.fc6 on branch devel from dxpc-3.9.1-0.1.b1.fc6.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 8ccf71c..143e268 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dxpc-3.9.0.tgz +dxpc-3.9.1b1.tgz diff --git a/dxpc-3.8.2-mandir.patch b/dxpc-3.8.2-mandir.patch deleted file mode 100644 index 23d8cf4..0000000 --- a/dxpc-3.8.2-mandir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dxpc-3.8.2/Makefile.in.mandir 2002-11-11 12:37:52.000000000 -0600 -+++ dxpc-3.8.2/Makefile.in 2003-06-12 14:10:41.000000000 -0500 -@@ -7,7 +7,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --man1dir = @mandir@/man1 -+mandir = @mandir@ - VPATH = @srcdir@ - - INSTALL = @INSTALL@ -@@ -57,8 +57,8 @@ - $(INSTALL) $(TARGET) $(bindir)/$(TARGET) - - install.man: -- $(srcdir)/mkinstalldirs $(man1dir) -- $(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1 -+ $(srcdir)/mkinstalldirs $(mandir)/man1 -+ $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 - - clean: - -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out diff --git a/dxpc-3.9.0-dxpcssh.patch b/dxpc-3.9.0-dxpcssh.patch new file mode 100644 index 0000000..2684d88 --- /dev/null +++ b/dxpc-3.9.0-dxpcssh.patch @@ -0,0 +1,30 @@ +--- Makefile.in.dxpcssh 2007-01-22 15:26:16.000000000 -0500 ++++ Makefile.in 2007-01-22 22:18:19.000000000 -0500 +@@ -26,6 +26,7 @@ + $(CXX) $(CPPFLAGS) -c $(CXXFLAGS) $< + + TARGET= dxpc$(EXEEXT) ++TARGETSSH = dxpcssh + + # The mingw build results in two targets, the console mode and windows mode + # app. +@@ -69,7 +70,7 @@ + depends: + makedepend -f Makefile $(SRCS) + +-install: install.bin install.man ++install: install.bin install.man install.scripts + + install.bin: $(TARGET) + $(srcdir)/mkinstalldirs $(bindir) +@@ -79,6 +80,10 @@ + $(srcdir)/mkinstalldirs $(mandir)/man1 + $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 + ++install.scripts: ++ $(srcdir)/mkinstalldirs $(mandir)/man1 ++ $(INSTALL) $(TARGETSSH) $(bindir)/$(TARGETSSH) ++ + clean: + -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out + diff --git a/dxpc-3.9.0-mandir.patch b/dxpc-3.9.0-mandir.patch new file mode 100644 index 0000000..a13ee3b --- /dev/null +++ b/dxpc-3.9.0-mandir.patch @@ -0,0 +1,22 @@ +--- dxpc-3.9.0/Makefile.in.mandir 2006-02-28 15:46:52.000000000 -0500 ++++ dxpc-3.9.0/Makefile.in 2007-01-22 11:02:08.000000000 -0500 +@@ -9,7 +9,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-man1dir = @mandir@/man1 ++mandir = @mandir@ + VPATH = @srcdir@ + + INSTALL = @INSTALL@ +@@ -76,8 +76,8 @@ + $(INSTALL) $(TARGET) $(bindir)/$(TARGET) + + install.man: +- $(srcdir)/mkinstalldirs $(man1dir) +- $(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1 ++ $(srcdir)/mkinstalldirs $(mandir)/man1 ++ $(INSTALL_DATA) $(TARGET).man $(mandir)/man1/$(TARGET).1 + + clean: + -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out diff --git a/dxpc.spec b/dxpc.spec index 1dd57dc..79e9113 100644 --- a/dxpc.spec +++ b/dxpc.spec @@ -1,19 +1,17 @@ - -Summary: Differential X Protocol Compressor +Summary: A Differential X Protocol Compressor Name: dxpc -Version: 3.9.0 -Release: 1%{?dist} +Version: 3.9.1 +Release: 0.1.b1%{?dist} -# Since dxpc links against GPL'd lzo, changed license from BSD -> GPL -License: GPL -Group: User Interface/X +License: BSD +Group: User Interface/X URL: http://www.vigor.nu/dxpc/ -Source: http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tgz +Source: http://www.vigor.nu/dxpc-%{version}b1.tgz +Patch0: dxpc-3.9.0-mandir.patch +Patch1: dxpc-3.9.0-dxpcssh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: dxpc-3.8.2-mandir.patch - -BuildRequires: lzo-devel +BuildRequires: lzo-devel >= 1.08 %if "%{?fedora}" > "4" BuildRequires: libXt-devel %else @@ -23,40 +21,54 @@ BuildRequires: xorg-x11-devel %description dxpc is an X protocol compressor designed to improve the speed of X11 applications run over low-bandwidth links -(such as dialup PPP connections). +(such as dialup PPP connections or ADSL). %prep -%setup -q +%setup -q -n %{name}-%{version}b1 -%patch1 -p1 -b .mandir +%patch0 -p1 -b .mandir +%patch1 -p0 -b .dxpcssh %build -%configure - +%configure make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README* CHANGES TODO +%doc README CHANGES TODO %{_bindir}/* %{_mandir}/man1/* %changelog -* Tue Jul 25 2006 Rex Dieter 3.9.0-1 -- 3.9.0 +* Fri Feb 02 2007 John Guthrie - 3.9.1-0.1.b1 +- Upgraded source code to 3.9.1-0.1.b1 + +* Mon Jan 29 2007 John Guthrie - 3.9.0-3 +- Removed test for %%{buildroot} +- Cleaned up warnings from rpmlint +- Removed README.mingw from the documentation as it had no relevance to + Linux + +* Mon Jan 22 2007 John Guthrie - 3.9.0-3 +- Added patch to Makefile.in to make it install dxpcssh + +* Mon Jan 22 2007 John Guthrie - 3.9.0-2 +- Updated to 3.9.0 +- Added mandir patch that was used in 3.8.2 +- Changed $RPM_BUILD_ROOT to %%{buildroot} in scriptlets for consistency * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin @@ -73,4 +85,3 @@ rm -rf $RPM_BUILD_ROOT * Tue Jun 17 2003 Rex Dieter 0:3.8.2-0.fdr.0 - 3.8.2 - diff --git a/sources b/sources index c4acf68..dfce7a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff8148868271b405a1a67b412e45d4e1 dxpc-3.9.0.tgz +b3ea5af52360a141c2c56182b99c6516 dxpc-3.9.1b1.tgz