diff --git a/libical.changes b/libical.changes
index e152ad6..a2bafbf 100644
--- a/libical.changes
+++ b/libical.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Dec 20 23:48:21 IST 2008 - msuman@suse.de
+
+- Use proper RPM macros in the spec file, remove unnecessary options
+  passed to the configure script. 
+
 -------------------------------------------------------------------
 Tue Dec  2 00:27:07 CET 2008 - dmueller@suse.de
 
diff --git a/libical.spec b/libical.spec
index 90a6be5..b8ff1d7 100644
--- a/libical.spec
+++ b/libical.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libical (Version 0.42)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,11 +25,11 @@ License:        LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        0.42
-Release:        1
+Release:        2
 Summary:        An Implementation of Basic iCAL Protocols
-Source:         libical-%version.tar.bz2
+Source:         libical-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       libical0 = %version
+Requires:       libical0 = %{version}
 
 %description
 Libical is an open source implementation of the IETF's iCalendar
@@ -86,7 +86,7 @@ Authors:
 License:        MOZILLA PUBLIC LICENSE (MPL/NPL)
 Summary:        An Implementation of Basic iCAL Protocols
 Group:          Development/Libraries/C and C++
-Requires:       libical = %version
+Requires:       libical = %{version}
 
 %description -n libical-doc
 Libical is an open source implementation of the IETF's iCalendar
@@ -104,28 +104,26 @@ Authors:
 %setup -q -n libical-%{version}
 
 %build
-autoreconf -f -i
-CFLAGS="$RPM_OPT_FLAGS" \
-CXXFLAGS="$RPM_OPT_FLAGS" \
-  ./configure \
-     --prefix=/usr \
-     --libdir=%{_libdir} \
-     -with-bdb4-dir=/usr \
-     --without-builtintz \
-     --with-bdb4 --enable-shared --disable-static \
-     --enable-python
-make
+#autoreconf -f -i
+%{configure} \
+	--with-bdb4 \
+	--with-bdb4-dir=%{_prefix} \
+	--without-builtintz \
+	--enable-python \
+	--enable-shared \
+	--disable-static
+%{__make}
 
 %install
-make install DESTDIR=%{buildroot}
-rm -rf examples/.deps/
-rm -rf examples/.libs
-rm -rf examples/*.o
-rm examples/doesnothing
-rm -rf scripts/Makefile*
-sed -i -e '1s,.*,#!/usr/bin/perl,' scripts/mkneticali.pl
-rm -rf doc/Makefile* 
-rm -f $RPM_BUILD_ROOT/%_libdir/lib*.la
+%{makeinstall}
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/libical*.la
+%{__rm} doc/Makefile*
+%{__rm} -rf examples/.deps
+%{__rm} -rf examples/.libs
+%{__rm} examples/*.o
+%{__rm} examples/doesnothing
+%{__rm} scripts/Makefile*
+%{__sed} -i -e '1s,.*,#!/usr/bin/perl,' scripts/mkneticali.pl
 
 %post -n libical0 -p /sbin/ldconfig
 
@@ -139,15 +137,18 @@ rm -f $RPM_BUILD_ROOT/%_libdir/lib*.la
 %files -n libical-devel
 %defattr(-,root,root)
 %{_libdir}/*.so
-/usr/include/ical.h
-/usr/include/libical
-%_libdir/pkgconfig/libical.pc
+%{_libdir}/pkgconfig/libical.pc
+%{_includedir}/ical.h
+%{_includedir}/libical
 
 %files -n libical-doc
 %defattr(-,root,root)
 %doc doc examples scripts
 
 %changelog
+* Fri Dec 19 2008 msuman@suse.de
+- Use proper RPM macros in the spec file, remove unnecessary options
+  passed to the configure script.
 * Tue Dec 02 2008 dmueller@suse.de
 - update to 0.42:
   * Fix for storing inline attachments