rpms/dxpc/devel dxpc-3.9.0-dxpcssh.patch, NONE, 1.1 dxpc-3.9.0-mandir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 dxpc.spec, 1.14, 1.15 sources, 1.6, 1.7 dxpc-3.8.2-mandir.patch, 1.3, NONE

Fri Feb 2 22:27:34 UTC 2007

Author: guthrie

Update of /cvs/extras/rpms/dxpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23931/devel

Modified Files:
	.cvsignore dxpc.spec sources 
Added Files:
	dxpc-3.9.0-dxpcssh.patch dxpc-3.9.0-mandir.patch 
Removed Files:
	dxpc-3.8.2-mandir.patch 
Log Message:
auto-import dxpc-3.9.1-0.1.b1.fc6 on branch devel from dxpc-3.9.1-0.1.b1.fc6.src.rpm

dxpc-3.9.0-dxpcssh.patch:

--- NEW FILE dxpc-3.9.0-dxpcssh.patch ---
--- 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
 

dxpc-3.9.0-mandir.patch:

--- NEW FILE dxpc-3.9.0-mandir.patch ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Jul 2006 22:06:39 -0000	1.3
+++ .cvsignore	2 Feb 2007 22:27:02 -0000	1.4
@@ -1 +1 @@
-dxpc-3.9.0.tgz
+dxpc-3.9.1b1.tgz


Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dxpc.spec	2 Feb 2007 22:21:24 -0000	1.14
+++ dxpc.spec	2 Feb 2007 22:27:02 -0000	1.15
@@ -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 @@
 %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 <rexdieter[AT]users.sf.net> 3.9.0-1
-- 3.9.0
+* Fri Feb 02 2007 John Guthrie <guthrie[AT]counterexample.org> - 3.9.1-0.1.b1
+- Upgraded source code to 3.9.1-0.1.b1
+
+* Mon Jan 29 2007 John Guthrie <guthrie[AT]counterexample.org> - 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 <guthrie[AT]counterexample.org> - 3.9.0-3
+- Added patch to Makefile.in to make it install dxpcssh
+
+* Mon Jan 22 2007 John Guthrie <guthrie[AT]counterexample.org> - 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 <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
@@ -73,4 +85,3 @@
 
 * Tue Jun 17 2003 Rex Dieter <rexdieter at sf.net> 0:3.8.2-0.fdr.0
 - 3.8.2
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2007 22:21:24 -0000	1.6
+++ sources	2 Feb 2007 22:27:02 -0000	1.7
@@ -1 +1 @@
-ff8148868271b405a1a67b412e45d4e1  dxpc-3.9.0.tgz
+b3ea5af52360a141c2c56182b99c6516  dxpc-3.9.1b1.tgz


--- dxpc-3.8.2-mandir.patch DELETED ---


