[rpms/trash-cli] pr6: * Wed Apr 25 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org>

[rpms/trash-cli] pr6: * Wed Apr 25 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org>

[Ankur Sinha]

            A new commit has been pushed.

            Repo   : rpms/trash-cli
            Branch : pr6
            Commit : c3b966335acd556c94d96eca46a464d506cb45f4
            Author : Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
            Date   : 2012-04-25T17:30:12+05:30
            Stats  : +17/-45 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/trash-cli/c/c3b966335acd556c94d96eca46a464d506cb45f4?branch=pr6

            Log:
            * Wed Apr 25 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- Update to latest upstream release

- deleted:    trash-cli-empty_days.patch
- Upstream has changed file structure. Will need to test and get a new
  patch

---
diff --git a/.gitignore b/.gitignore
index f9a8b8d..e04968f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 trash-cli-0.11.2.tar.gz
 /trash-cli-0.11.3-r315.tar.gz
+/trash-cli-0.12.4.24.tar.gz

diff --git a/sources b/sources
index b877f53..005b3e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00654c149108fc4c522b5b008e9b8468  trash-cli-0.11.3-r315.tar.gz
+e45e30c5b2d07f187b30cc13d194250a  trash-cli-0.12.4.24.tar.gz

diff --git a/trash-cli-empty_days.patch b/trash-cli-empty_days.patch
deleted file mode 100644
index 1d99366..0000000
--- a/trash-cli-empty_days.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/trashcli/cli/empty.py b/trashcli/cli/empty.py
-index 70a49f2..b290e89 100755
---- a/trashcli/cli/empty.py
-+++ b/trashcli/cli/empty.py
-@@ -55,11 +55,12 @@ def main(argv=None) :
-     if len(args) > 1 :
-         parser.print_usage()
-         parser.exit()
--    elif len(args) > 1 :
-+    elif len(args) > 0 :
-         try :
--            days=int(args[1])
-+            days=int(args[0])
-         except :
-             parser.print_usage()
-+            parser.exit()
- 
-     for trashedfile in trashcan.trashed_files() :
-         delta=datetime.datetime.now()-trashedfile.deletion_date

diff --git a/trash-cli.spec b/trash-cli.spec
index 697ea4c..9543779 100644
--- a/trash-cli.spec
+++ b/trash-cli.spec
@@ -3,13 +3,12 @@
 
 Summary:        Command line interface to the freedesktop.org trashcan
 Name:           trash-cli
-Version:        0.11.3
-Release:        0.5.r315%{?dist}
+Version:        0.12.4.24
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
 URL  :          http://trash-cli.googlecode.com/
-Source0:        http://trash-cli.googlecode.com/files/trash-cli-%{version}-r315.tar.gz
-Patch0:         trash-cli-empty_days.patch
+Source0:        http://pypi.python.org/packages/source/t/trash-cli/trash-cli-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python-setuptools-devel dos2unix
 Requires:       python-unipath python-setuptools
@@ -20,16 +19,7 @@ freedesktop.org compatible trash implementation. The command line interface is
 compatible with rm and you can use trash-put as an alias to rm.  
 
 %prep
-%setup -q -n %{name}-%{version}-r315
-%patch0 -p1
-
-for f in filesystem.py cli/restore.py cli/util.py ; do
-    dos2unix -k trashcli/$f
-done
-
-for f in cli/restore.py cli/util.py filesystem.py trash.py ; do
-    %{__sed} -i -e '1d' trashcli/$f
-done
+%setup -q 
 
 %build
 %{__python} setup.py build
@@ -37,29 +27,29 @@ done
 %install
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT 
 
-# installs to /usr/man/man1 instead of /usr/share/man/man1 otherwise
-install -d $(dirname %{buildroot}%{_mandir})
-mv %{buildroot}/usr/man %{buildroot}%{_mandir}
-
-# rename the restore to keep it consistent with other package binaries
-# also, enables better tab completion
-
-mv -v %{buildroot}/%{_bindir}/restore-trash %{buildroot}/%{_bindir}/trash-restore
-rm -f %{buildroot}/%{_bindir}/volume-of
+# remove the testing part
+rm -fvr $RPM_BUILD_ROOT/%{python_sitelib}/unit_tests
+rm -fvr $RPM_BUILD_ROOT/%{python_sitelib}/integration_tests 
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt AUTHORS COPYING
+%doc README.txt
 
-%{_bindir}/trash-*
+%{_bindir}/trash*
+%{_bindir}/restore-trash
 %{python_sitelib}/trashcli/
 %{python_sitelib}/trash_cli-*-py%{pyver}.egg-info
 %{_mandir}/man1/trash-*
+%{_mandir}/man1/restore-trash*
 
 %changelog
+* Wed Apr 25 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.12.4.24-1
+- Update to new release
+- update source url
+
 * Fri Jan 06 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.11.3-0.5.r315
 - spec bump for gcc 4.7 rebuild