This commit was manufactured by cvs2git to create tag 'STABLE'.STABLE

Sprout from master 2001-02-22 18:25:26 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> 'fix DESTDIR'
Cherrypick from master 2001-03-11 21:07:11 UTC kloczek <kloczek@pld-linux.org> '- updated for 0.3.8.':
    twin-makeinstall.patch -> 1.2
Cherrypick from master 2002-10-30 05:13:26 UTC kloczek <kloczek@pld-linux.org> '- updated to 0.4.5: bug fixes.':
    twin.spec -> 1.25

2 files changed, 136 insertions, 66 deletions

diff --git a/twin-makeinstall.patch b/twin-makeinstall.patch
new file mode 100644
index 0000000..b8cd79d
--- /dev/null
+++ b/twin-makeinstall.patch
@@ -0,0 +1,12 @@
+diff -Nru twin-0.3.8/Makefile twin-0.3.8.new/Makefile
+--- twin-0.3.8/Makefile	Sun Mar 11 21:36:45 2001
++++ twin-0.3.8.new/Makefile	Sun Mar 11 21:37:55 2001
+@@ -57,7 +57,7 @@
+ 	$(MAKE) Torture -C clients
+ 	
+ #
+-install: all install-lib install-clients
++install: install-lib install-clients
+ 	$(MAKE) install -C docs DESTDIR=$(DESTDIR) 
+ 	$(MAKE) install -C server DESTDIR=$(DESTDIR) 
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)/twin
diff --git a/twin.spec b/twin.spec
index 59de5da..9a8afa6 100644
--- a/twin.spec
+++ b/twin.spec
@@ -1,21 +1,21 @@
 Summary:	Twin - a windowing environment
+Summary:	Tekstowe środowisko okienkowe
 Name:		twin
-Version:	0.3.7
-Release:	2
+Version:	0.4.5
+Release:	1
 License:	LGPL
 Group:		Libraries
-Group(de):	Libraries
-Group(pl):	Biblioteki
-Source0:	http://download.sourceforge.net/twin/%{name}-%{version}.tar.gz
-Patch0:		%{name}-ncurses.patch
-Patch1:		%{name}-DESTDIR.patch
-Patch2:		%{name}-optflags.patch
+Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/twin/%{name}-%{version}.tar.gz
+URL:		http://twin.sourceforge.net/
 BuildRequires:	XFree86-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:	gpm-devel
+BuildRequires:	gtk+-devel
 BuildRequires:	libggi-devel
+BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	zlib-devel
-URL:		http://twin.sourceforge.net/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,25 +23,37 @@ Twin is a windowing environment with mouse support, window manager,
 terminal emulator and networked clients, all inside a text display.
 
 It supports a variety of displays:
-- plain text terminals (any termcap/ncurses compatible terminal,
-  Linux console, twin's own terminal emulator);
+- plain text terminals (any termcap/ncurses compatible terminal, Linux
+  console, twin's own terminal emulator);
 - X11, where it can be used as a multi-window xterm;
 - itself (you can display a twin on another twin);
-- twdisplay, a general network-transparent display client, used
-  to attach/detach more displays on-the-fly.
+- twdisplay, a general network-transparent display client, used to
+  attach/detach more displays on-the-fly.
+
+%description -l pl
+Twin jest tekstowym środowiskiem okienkowym - zmienia terminal
+tekstowy w środowisko podobne do menedżera okien znanego ze środowiska
+X Window.
+
+Obsługuje wyświetlanie na:
+- terminalach czysto tekstowych (dowolnym zgodnym z termcap/ncurses,
+  konsoli Linuksa, własnym emulatorze Twin)
+- w systemie X Window, gdzie może być używany jako wielookienkowy
+  xterm
+- sobie samym (można wyświetlać twin na innym twin)
+- twdisplay, czyli ogólnym, przeźroczystym sieciowo kliencie, używanym
+  do dołączania i odłączania w locie.
 
 %package devel
-Summary:	Header files and etc for develop twin applications
+Summary:	Header files etc for developing twin applications
 Summary(pl):	Pliki nagłówkowe dla twin
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 
 %description devel
-Header files and etc for develop twin applications.
+Header files etc for developing twin applications.
 
-%description -l pl devel
+%description devel -l pl
 Pliki nagłówkowe i inne potrzebne do tworzenia programów opartych o
 twin.
 
@@ -49,55 +61,73 @@ twin.
 Summary:	Static twin libraries
 Summary(pl):	Biblioteki statyczne twin
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 
 %description static
 Static twin libraries.
 
-%description -l pl static
+%description static -l pl
 Biblioteki statyczne twin.
 
+%package TT-hw-gtk
+Summary:	TT gtk driver for twin
+Summary(pl):	Sterownik TT gtk do twin
+Group:		Libraries
+Requires:	%{name} = %{version}
+
+%description TT-hw-gtk
+gtk target driver for twin's TT library.
+
+%description TT-hw-gtk -l pl
+Sterownik wyjścia gtk do biblioteki TT z twin.
+
+%package hw-X11
+Summary:	X11 driver for twin
+Summary(pl):	Sterownik X11 do twin
+Group:		Libraries
+Requires:	%{name} = %{version}
+
+%description hw-X11
+X11 driver for twin.
+
+%description hw-X11 -l pl
+Sterownik X11 do twin.
+
+%package hw-ggi
+Summary:	GGI driver for twin
+Summary(pl):	Sterownik GGI do twin
+Group:		Libraries
+Requires:	%{name} = %{version}
+
+%description hw-ggi
+GGI driver for twin.
+
+%description hw-ggi -l pl
+Sterownik GGI do twin.
+
+%package hw-tty
+Summary:	TTY driver with GPM support for twin
+Summary(pl):	Sterownik TTY z obsługą GPM-a do twin
+Group:		Libraries
+Requires:	%{name} = %{version}
+
+%description hw-tty
+TTY driver with mouse support through GPM for twin.
+
+%description hw-tty -l pl
+Sterownik TTY z obsługą myszy przez GPM do twin.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__make} config <<EOF
-y
-y
-n
-m
-y
-y
-m
-m
-n
-y
-m
-y
-n
-m
-y
-y
-y
-y
-m
-m
-m
-m
-y
-n
-n
-n
-y
-y
-n
-EOF
-%{__make} OPT_FLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}"
+rm -f missing
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+
+%configure
+%{__make} CFLAGS="%{rpmcflags} -Wall -D_GNU_SOURCE"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,9 +137,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 install docs/twin.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-gzip -9nf BUGS Changelog.txt README README.porting TODO twin-0.3.7.lsm \
-	docs/{Configure,libTw++.txt,libTw.txt}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -118,20 +145,51 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc BUGS Changelog.txt README TODO docs/{Compatibility,Philosophy,Tutorial}
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%dir %{_libdir}/twin/
+%dir %{_libdir}/TT
+%dir %{_libdir}/TT/HW
+%attr(755,root,root) %{_libdir}/TT/HW/hw_twin.so*
+%attr(755,root,root) %{_libdir}/TT/HW/hw_xml.so*
+%dir %{_libdir}/twin
+%{_libdir}/twin/system.*
 %dir %{_libdir}/twin/modules
+%attr(755,root,root) %{_libdir}/twin/modules/*.so*
 %dir %{_libdir}/twin/modules/HW
-%attr(755,root,root) %{_libdir}/twin/modules/*.so
-%attr(755,root,root) %{_libdir}/twin/modules/HW/*.so
+%attr(755,root,root) %{_libdir}/twin/modules/HW/hw_display.so*
+%attr(755,root,root) %{_libdir}/twin/modules/HW/hw_twin.so*
+%dir %{_datadir}/twin
+%dir %{_datadir}/twin/themes
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz docs/*.gz
+%doc docs/libTw.txt clients/README.twsetroot
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/*
 
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/lib*.a
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
+
+%files TT-hw-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/TT/HW/hw_gtk.so*
+
+%files hw-X11
+%defattr(644,root,root,755)
+%doc themes/hw_gfx/README
+%attr(755,root,root) %{_libdir}/twin/modules/HW/hw_X*.so*
+%attr(755,root,root) %{_libdir}/twin/modules/HW/hw_gfx.so*
+%dir %{_datadir}/twin/themes/hw_gfx
+%{_datadir}/twin/themes/hw_gfx/*.xpm
+
+%files hw-ggi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/twin/modules/HW/hw_ggi.so*
+
+%files hw-tty
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/twin/modules/HW/hw_tty.so*