- upgraded to 0.7.5

Changed files:
    aldo-DESTDIR.patch -> 1.3
    aldo.spec -> 1.10

diff --git a/aldo-DESTDIR.patch b/aldo-DESTDIR.patch
deleted file mode 100644 (file)
index 405bcbf..0000000
--- a/aldo-DESTDIR.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN aldo-0.6.3-orig/libdatafile/Makefile aldo-0.6.3/libdatafile/Makefile
---- aldo-0.6.3-orig/libdatafile/Makefile       2003-04-09 11:30:24.000000000 +0200
-+++ aldo-0.6.3/libdatafile/Makefile    2004-01-30 16:59:11.000000000 +0100
-@@ -20,9 +20,9 @@
-       @rm -f $(OBJECTS) $(PACKAGE)
- 
- install: all
--      rm -Rf /usr/include/datafile
--      mkdir /usr/include/datafile
--      cp $(HEADERS) /usr/include/datafile
--      cp lib/$(NAMELIB) /usr/lib/libdatafile.so
--      ldconfig
-+      rm -Rf $(DESTDIR)/usr/include/datafile
-+      mkdir $(DESTDIR)/usr/include/datafile
-+      cp $(HEADERS) $(DESTDIR)/usr/include/datafile
-+      cp lib/$(NAMELIB) $(DESTDIR)/usr/lib/libdatafile.so
-+#     ldconfig
-       @echo type 'make clean'
-diff -urN aldo-0.6.3-orig/Makefile aldo-0.6.3/Makefile
---- aldo-0.6.3-orig/Makefile   2003-11-20 21:56:49.000000000 +0100
-+++ aldo-0.6.3/Makefile        2004-01-30 16:57:03.000000000 +0100
-@@ -63,9 +63,6 @@
- clean_aldo:
-       @$(RM) aldo $(OBJECTS)
- 
--install: libs aldo uninstall
-+install: libs aldo
-       @strip aldo
--      @install -m555 -oroot aldo /usr/bin/
--
--uninstall:
--      @$(RM) /usr/bin/aldo
-+      @install aldo $(DESTDIR)/usr/bin/

diff --git a/aldo.spec b/aldo.spec
index 743b0100f1ad48affecf141cb3e787567699e3b1..2e9a9dba3ee62c3415d1d6a973884cf77177c6bd 100644 (file)
--- a/aldo.spec
+++ b/aldo.spec
@@ -1,13 +1,15 @@
 Summary:       Morse code tutor
 Summary(pl.UTF-8):     Program do nauki alfabetu Morse'a
 Name:          aldo
-Version:       0.6.3
-Release:       2
+Version:       0.7.5
+Release:       1
 License:       GPL
 Group:         Applications
-Source0:       http://dl.sourceforge.net/aldo/%{name}-%{version}.tar.bz2
-# Source0-md5: 7548bed9282f4581858648236a9ac5e0
-Patch0:                %{name}-DESTDIR.patch
+Source0:       http://savannah.nongnu.org/download/aldo/%{name}-%{version}.tar.bz2
+# Source0-md5: c429c6a24addfcfae0c41b4bf3d858d5
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libao-devel
 URL:           http://www.nongnu.org/aldo/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -22,14 +24,17 @@ aby zacząć ćwiczyć telegrafię.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -39,5 +44,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README
+%doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/%{name}.1*