--- sim.spec.orig	2005-04-29 16:45:13 +0700
+++ sim.spec	2005-04-29 16:50:57 +0700
@@ -1,21 +1,16 @@
-%define name	sim
-%define version	0.8.3
-%define release	2aphlux
-
-Name:		%name
+Name:		sim
 Summary:	A QT/KDE ICQ instant messaging client
-Version:	%version
-Release:	%release
-Source:		%{name}-%{version}.tar.bz2
+Version:	0.8.3
+Release:	2aphlux
+Source:		%name-%version.tar.bz2
 License:	GPL
 Group:		Networking/Instant messaging
 Url:		http://sim-icq.sourceforge.net/
-BuildRoot:	%{_tmppath}/%{name}-buildroot
 Requires:	libqt3 > 3.0.4, kdelibs > 3.0
 BuildRequires:	libqt3-devel > 3.0.4, kdelibs-devel > 3.0
 BuildRequires:  autoconf_2.5, automake_1.7
 BuildRequires:	libfam-devel
-Patch1:		correct_appsdir.patch.bz2
+Patch:		correct_appsdir.patch.bz2
 
 %description
 Sim is a QT icq client with enhanced features and special support for KDE2/3. 
@@ -42,10 +37,9 @@
 - Sending of the messages to several users 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q
 
-%patch1 -p0 -b .correct_appsdir
+%patch -p0 -b .correct_appsdir
 
 %__subst 's,\.la\>,.so,' admin/acinclude.m4.in
 %__subst "s/\-ansi /\-fPIC -DPIC /g" admin/acinclude.m4.in
@@ -55,7 +49,7 @@
 #WANT_AUTOCONF_2_5=1 gmake -f admin/Makefile.common
 
 # my libtool doesn't know --tag. where did that come from ?
-perl -pi -e 's/^(CXXLINK.*?)\s*--tag=CXX/$1/' sim/Makefile.in
+%__perl -pi -e 's/^(CXXLINK.*?)\s*--tag=CXX/$1/' sim/Makefile.in
 
 %configure --disable-rpath
 %make
@@ -64,34 +58,29 @@
 %makeinstall
 
 # Menu
-mkdir -p %buildroot/%_menudir
-cat > %buildroot/%_menudir/%name  <<EOF
+%__mkdir_p %buildroot/%_menudir
+%__cat > %buildroot/%_menudir/%name  <<EOF
 ?package(%name): command="%_bindir/%name" needs="X11" \
 icon="%name.png" section="Networking/Instant messaging" \
 title="SIM" longtitle="Simple Instant Messenger."
 EOF
 
-%{find_lang} %{name}
+%find_lang %name
 
 %post
-%{update_menus}
+%update_menus
 
 %postun
-%{clean_menus}
+%clean_menus
 
 %files -f %name.lang
-%defattr(-,root,root,0755)
-%{_bindir}/sim
-%{_bindir}/simctrl
-%{_datadir}/applnk/Internet/sim.desktop
-%{_datadir}/apps/%name
-%{_iconsdir}/hicolor/*/*/*
-%{_iconsdir}/locolor/*/*/*
 %doc ChangeLog README
-%{_menudir}/*
-
-%clean
-rm -r $RPM_BUILD_ROOT
+%_bindir/*
+%_datadir/applnk/Internet/sim.desktop
+%_datadir/apps/%name
+%_iconsdir/hicolor/*/*/*
+%_iconsdir/locolor/*/*/*
+%_menudir/*
 
 %changelog
 * Tue Aug 12 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.8.3-2mdk