@@ -9,7 +9,7 @@

 Summary: Perl module for the X Window System Protocol

 Name: perl-X11-Protocol

-Version: 0.56

+Version: 0.55

 Release: 1

 License: Artistic

 Group: Applications/CPAN

@@ -21,58 +21,37 @@

 BuildArch: noarch

 BuildRequires: perl

-%if 0%{?fedora_version} >= 7

-BuildRequires: perl-ExtUtils-MakeMaker

-%endif

 %description

 This is a module for the X Window System Protocol.

 %prep

 %setup -q -n %{real_name}-%{version}

-perl Makefile.PL

+

+%build

+%{__perl} Makefile.PL INSTALLDIRS="vendor" # PREFIX="%{buildroot}%{_prefix}"

 %{__make} %{?_smp_mflags}

-%makeinstall DESTDIR=$RPM_BUILD_ROOT

-%if 0%{?suse_version}

-%perl_process_packlist

-%else

-find $RPM_BUILD_ROOT -name perllocal.pod -exec rm {} \; >/dev/null

-%endif

-cd $RPM_BUILD_ROOT

-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}

-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}

-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}

+

+%install

+%{__rm} -rf %{buildroot}

+%makeinstall

+

+### Clean up buildroot

+%{__rm} -rf %{buildroot}%{perl_archlib} \

+       %{buildroot}%{perl_vendorarch}

 %clean

-rm -rf $RPM_BUILD_ROOT/*

-rm -rf $RPM_BUILD_DIR/%{name}*

+%{__rm} -rf %{buildroot}

-%if 0%{?suse_version}

 %files

-%doc Changes README Todo

-/usr/share/man/man3/*

-/var/adm/perl-modules/perl-%{real_name}

-%{perl_sitelib}/*

-%ifarch %ix86

-%{perl_sitelib}/i586-linux-thread-multi

-%endif

-%ifarch x86_64

-%{perl_sitelib}/x86_64-linux-thread-multi

-%endif

-

-%else

-

-%files -f ../file.list.%{name}

-

-%endif

-

-

+%defattr(-, root, root, 0755)

+%doc Changes README

+%doc %{_mandir}/man3/*

+%dir %{perl_vendorlib}/X11/

+%{perl_vendorlib}/X11/*.pm

+%{perl_vendorlib}/X11/Protocol/

 %changelog

-* Sat Sep 22 2007 Carsten Schoene <cs@linux-administrator.com> - 0.56-1

-- Updated to releas 0.56

-- added BuildRequires for Fedora 7 

-

 * Mon Jul 31 2006 Richard Bos <richard@radoeka.nl> - 0.55-1

 - Initial build for opensuse

@@ -87,4 +66,3 @@

 * Wed Dec 08 2004 Dries Verachtert <dries@ulyssis.org> - 0.53-1

 - Initial package.

-

​