rpms/tla/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tla.spec, 1.18, 1.19 tla-sysneon.patch, 1.3, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources tla.spec 
Removed Files:
	tla-sysneon.patch 
Log Message:
* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-2
- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
  man page and hopefully fixes ppc segfaults etc.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jun 2005 17:07:15 -0000	1.8
+++ .cvsignore	14 Dec 2005 09:58:41 -0000	1.9
@@ -1,2 +1,3 @@
 tla-1.3.3.tar.gz
 tla-1.3.3.tar.gz.sig
+tla_1.3.3-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Jun 2005 17:07:15 -0000	1.8
+++ sources	14 Dec 2005 09:58:43 -0000	1.9
@@ -1,2 +1,3 @@
 61d5dea41e071f78a8319401ee07ab0b  tla-1.3.3.tar.gz
 2e176f99458250c04c6cbdb2f71b6b27  tla-1.3.3.tar.gz.sig
+feb23c5632fec91307f29738ec246c12  tla_1.3.3-3.diff.gz


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tla.spec	13 Dec 2005 22:06:39 -0000	1.18
+++ tla.spec	14 Dec 2005 09:58:43 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Low-Budget Arch Revision Control System
 
 Group:          Development/Tools
@@ -10,7 +10,7 @@
 Source1:        http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz.sig
 # Patch0 from SuSE 9.1's tla-1.2-15
 Patch0:         tla-1.2pre0-posix.patch
-Patch1:         tla-sysneon.patch
+Patch1:         http://ftp.debian.org/debian/pool/main/t/tla/tla_1.3.3-3.diff.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,6 @@
 %build
 mkdir src/=build
 cd src/=build
-#export CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 ../configure \
   --prefix=%{_prefix} --with-install-link-tools=yes --with-cc=%{__cc}
 make CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)" # %{?_smp_mflags} # 1.[23] is not parallel build clean
@@ -47,18 +46,20 @@
 mkdir -p docs-tla/html
 (cd ../docs-tla; find .  -name \*.css -o -name \*.html | xargs tar -cf- ) | \
 (cd docs-tla/html; tar -xf-)
+cd ../..
+
+mkdir debian/tmp
+PATH="`pwd`/src/=build/tla/tla:$PATH" perl debian/generate-manpage.pl tla.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd src/=build
-make install destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+make -C src/=build install \
+    destdir=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
+install -Dpm 644 debian/tmp/tla.1 $RPM_BUILD_ROOT%{_mandir}/man1/tla.1
+rm $RPM_BUILD_ROOT%{_bindir}/awiki
 
-%check || :
-cd src/=build
-make test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
-
-# don't install "awiki"
-rm $RPM_BUILD_ROOT%{_prefix}/bin/awiki
+%check
+make -C src/=build test CFLAGS="$RPM_OPT_FLAGS $(neon-config --cflags)"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +70,14 @@
 %{_bindir}/make-links
 %{_bindir}/remove-links
 %{_bindir}/tla
+%{_mandir}/man1/tla.1*
 
 %changelog
+* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-2
+- Apply 1.3.3-3 patchset from Debian; includes system neon patch, adds
+  man page and hopefully fixes ppc segfaults etc.
+- Specfile cleanups.
+
 * Tue Dec 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-2
 - Rebuild against new OpenSSL.
 


--- tla-sysneon.patch DELETED ---