diff --git a/perl-Class-Accessor.changes b/perl-Class-Accessor.changes
index 65fe13b..7a31cb3 100644
--- a/perl-Class-Accessor.changes
+++ b/perl-Class-Accessor.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Jul 25 19:29:15 CEST 2009 - chris@computersalat.de
+
+- spec mods
+  * removed ^----------
+  * removed ^#---------
+
+-------------------------------------------------------------------
+Sun Jun 28 16:09:41 CEST 2009 - chris@computersalat.de
+
+- added perl-macros
+  o autogen filelist with perl_gen_filelist
+- spec mods
+  o fixed deps
+    no usage of Carp::Assert since 0.15
+
 -------------------------------------------------------------------
 Mon May 18 15:48:57 CEST 2009 - anicka@suse.cz
 
diff --git a/perl-Class-Accessor.spec b/perl-Class-Accessor.spec
index a74f814..606a15e 100644
--- a/perl-Class-Accessor.spec
+++ b/perl-Class-Accessor.spec
@@ -19,89 +19,46 @@
 
 
 Name:           perl-Class-Accessor
-BuildRequires:  perl-Carp-Assert
-Version:        0.33
-Release:        1
-Requires:       perl-Carp-Assert
-Requires:       perl = %{perl_version}
-AutoReqProv:    on
-Group:          Development/Libraries/Perl
-License:        Artistic License
-Url:            http://cpan.org/modules/by-module/Class/
+%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' )
 Summary:        Automated accessor generation
-Source:         Class-Accessor-%{version}.tar.bz2
+Version:        0.33
+Release:        2
+License:        Artistic License ..
+Group:          Development/Libraries/Perl
+Url:            http://search.cpan.org/dists/Class-Accessor
+Source:         %{cpan_name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  perl
+BuildRequires:  perl-macros
+BuildRequires:  perl(Sub::Name)
+Requires:       perl = %{perl_version}
+Requires:       perl(Carp)
+Requires:       perl(Sub::Name)
 
 %description
 This module automatically generates accessor/mutators for your class.
 
-
-
-Authors:
---------
-    Michael G Schwern <schwern@pobox.com>
-
+  Authors:	Michael G Schwern <schwern@pobox.com>
 %prep
-%setup -q -n Class-Accessor-%{version}
+%setup -q -n %{cpan_name}-%{version}
 
 %build
-perl Makefile.PL
-make
-make test
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL
+%{__make}
+
+%check
+%{__make} test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
+%perl_make_install
 %perl_process_packlist
-chmod 755 examples/benchmark
+%perl_gen_filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.files
 %defattr(-,root,root)
-%doc %{_mandir}/man?/*
-%doc Changes README examples
-%{perl_vendorlib}/Class
-%{perl_vendorarch}/auto/Class
-/var/adm/perl-modules/%{name}
+%doc Changes README
 
 %changelog
-* Mon May 18 2009 anicka@suse.cz
-- update to 0.33
-  * small cleanups to fix RT#45592 and RT#43493
-* Wed Jul 25 2007 anicka@suse.cz
-- update to 0.31
-  * applied performance patch from RUZ
-* Wed Dec 13 2006 anicka@suse.cz
-- update to 0.30
-  * added version numbers back into each class
-* Mon Jul 24 2006 anicka@suse.cz
-- update to 0.27
-  * added Class::Accessor::Faster that uses an array internally
-* Tue Jul 11 2006 anicka@suse.cz
-- update to 0.25
-- minor release
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Jan 03 2006 anicka@suse.cz
-- update to 0.22
-* Wed Sep 28 2005 dmueller@suse.de
-- add norootforbuild
-* Fri Aug 13 2004 mjancar@suse.cz
-- update to 0.19
-* Fri Aug 22 2003 mjancar@suse.cz
-- require the perl version we build with
-* Tue Jul 15 2003 mjancar@suse.cz
-- adapt to perl-5.8.1
-- use %%perl_process_packlist
-* Wed Jun 18 2003 mjancar@suse.cz
-- fix filelist
-* Tue May 20 2003 mjancar@suse.cz
-- remove unpackaged files
-* Tue Jul 02 2002 mls@suse.de
-- remove race in .packlist generation
-* Wed Jun 26 2002 prehak@suse.cz
-- correct permissions of examples directories
-* Wed Jan 23 2002 rvasice@suse.cz
-- initial package release (version 0.17)