- preliminary cleanup

- no symlink hackery in post

Changed files:
    gadmintools-gproftpd.spec -> 1.2

diff --git a/gadmintools-gproftpd.spec b/gadmintools-gproftpd.spec
index ef6f61ef4812d2d1983841bc70e90c95c706a596..e6bee06faf2722a9a4c3b17256b8f309ffc4d182 100644 (file)
--- a/gadmintools-gproftpd.spec
+++ b/gadmintools-gproftpd.spec
@@ -4,15 +4,15 @@
 # - ensure that everything actually works and is installed
 #   as the install scripts are horrible in this package
 # - lookup for other BR-s
-%define                _realname       gproftpd
+%define                realname        gproftpd
 Summary:       A GTK+ administation tool for the ProFTPD server
-Summary(pl.UTF_8):Narzędzie GTK+ do administracji serwerem ProFTPD.
-Name:          gadmintools-%{_realname}
+Summary(pl.UTF_8):     Narzędzie GTK+ do administracji serwerem ProFTPD
+Name:          gadmintools-%{realname}
 Version:       8.3.2
 Release:       0.1
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://mange.dynalias.org/linux/%{_realname}/%{_realname}-%{version}.tar.gz
+Source0:       http://mange.dynalias.org/linux/gproftpd/%{realname}-%{version}.tar.gz
 # Source0-md5: 0b8a06c4972a00b912b0afa3ae6ec539
 Patch0:                %{name}-install.patch
 URL:           http://mange.dynalias.org/linux.html
@@ -29,7 +29,7 @@ GProFTPD jest szybkim i łatwym w użyciu narzędziem administracyjnym
 dla serwera ProFTPD napisanym w GTK+.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 
 %build
@@ -47,16 +47,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{_realname}
+%find_lang %{realname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# WTF?
-if test ! -h %{_bindir}/gproftpd ; then \
-ln -s %{_bindir}/consolehelper %{_bindir}/gproftpd ; \
-fi;
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
@@ -66,17 +62,17 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
-%files -f %{_realname}.lang
+%files -f %{realname}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_sbindir}/%{_realname}
+%attr(755,root,root) %{_sbindir}/%{realname}
 %attr(755,root,root) %{_sbindir}/gprostats
-%dir %{_sysconfdir}/%{_realname}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{_realname}*
-%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{_realname}
-%config(noreplace) %verify(not md5 mtime size) /etc/security/console.apps/%{_realname}
-%{_desktopdir}/%{_realname}.desktop
+%dir %{_sysconfdir}/%{realname}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{realname}/*
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{realname}
+%config(noreplace) %verify(not md5 mtime size) /etc/security/console.apps/%{realname}
+%{_desktopdir}/%{realname}.desktop
 %{_pixmapsdir}/*.png
-%dir %{_pixmapsdir}/%{_realname}
-%{_pixmapsdir}/%{_realname}/*.png
-%{_pixmapsdir}/%{_realname}/%{_realname}36.xpm
+%dir %{_pixmapsdir}/%{realname}
+%{_pixmapsdir}/%{realname}/*.png
+%{_pixmapsdir}/%{realname}/%{realname}36.xpm