[tw] Revert "Update to 0.9.8"

[Juan Manuel Borges Caño]

commit fcfc716650d73f5e9dfc863155d7a72d36219d3f
Author: Juan Manuel Borges Caño <juanmabcmail at gmail.com>
Date:   Sun Apr 28 19:58:36 2013 +0200

    Revert "Update to 0.9.8"
    
    This reverts commit 7130526a8945c67aeec3304e0a611eac038d1b00.
    
    Conflicts:
    	tw.spec

 .gitignore       |    1 -
 sources          |    2 +-
 tw-0.9.8.tar.bz2 |  Bin 0 -> 2762118 bytes
 tw.spec          |   35 +++++++++++++++++++++++++++--------
 4 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2152edc..e094d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /tw-0.9.4.tar.bz2
-/tw-0.9.8.tar.bz2
diff --git a/sources b/sources
index e060e7e..04e970e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2718d265ecb9f0ae5a9b30cd486368ed  tw-0.9.8.tar.bz2
+95ea0be3a831f00546de2be041c09264  tw-0.9.4.tar.bz2
diff --git a/tw-0.9.8.tar.bz2 b/tw-0.9.8.tar.bz2
new file mode 100644
index 0000000..f3789e7
Binary files /dev/null and b/tw-0.9.8.tar.bz2 differ
diff --git a/tw.spec b/tw.spec
index 76b000d..cde22e7 100644
--- a/tw.spec
+++ b/tw.spec
@@ -1,6 +1,11 @@
 Name:           tw
+<<<<<<< HEAD
 Version:        0.9.16
 Release:        1%{?dist}
+=======
+Version:        0.9.4
+Release:        7%{?dist}
+>>>>>>> parent of 7130526... Update to 0.9.8
 Summary:        Translate words into different languages
 
 License:        GPLv3+
@@ -25,10 +30,10 @@ Requires(post): info
 Requires(preun): info
 
 %description
-translate word is a command that translates words into different
-languages.  translate word uses internal dictionaries, and contacts
-online to the Google Translation and the FreeTranslation engines.
-It can also be integrated via the clipboard with a desktop environment.
+Translates words into different languages.  It uses internal dictionaries,
+and contacts online to the Google Translation and the FreeTranslation
+engines. It can also be integrated via the clipboard with a desktop
+environment.
 
 
 %prep
@@ -36,13 +41,15 @@ It can also be integrated via the clipboard with a desktop environment.
 
 
 %build
-%configure --docdir %{_docdir}/%{name}-%{version}
+%configure
 make %{?_smp_mflags}
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 export AM_UPDATE_INFO_DIR=no
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 
 %post
@@ -57,6 +64,7 @@ fi
 
 %files
 %{_bindir}/%{name}
+<<<<<<< HEAD
 %{_bindir}/mythes-raw
 %{_bindir}/mythes
 %{_datadir}/%{name}
@@ -88,6 +96,17 @@ fi
 - Use more generic man and info %%files.
 - Remove obsolete "rm -rf $RPM_BUILD_ROOT".
 
+=======
+%{_bindir}/%{name}-config-klipper
+%{_bindir}/mythes
+%{_datadir}/%{name}
+%{_docdir}/%{name}-%{version}
+%{_infodir}/%{name}.info.gz
+%{_mandir}/man1/%{name}.1.gz
+
+
+%changelog
+>>>>>>> parent of 7130526... Update to 0.9.8
 * Mon Dec 13 2012 Juan Manuel Borges Caño <juanmabcmail at gmail.com> - 0.9.4-7
 - Use GPLv3+.
 - Omit deprecated stuff like BuildRoot, Group, clean and defattr.
@@ -112,9 +131,9 @@ fi
 - In BuildRequires tag, omit coreutils, bash and sed. as per Guidelines#Exceptions.
 - BuildRequires and Requires entries listed one-by-one for a better spec legibility.
 - Fix Source* tag to the full URL for the compressed archive containing the (original) pristine source code.
-- Fix license to GPLv3.
-- Add Changelog.
+- Fix license to GPLv3
+- Add Changelog
 
 * Mon Dec 10 2012 Juan Manuel Borges Caño <juanmabcmail at gmail.com> - 0.9.4-1
-- Fedora review request (bug 885833).
+- Fedora review request (bug 885833)