commit 7446a99d8b11d08dc4d5b059aacbcebb8972e0dc
Author: Petr Písař <[email protected]>
Date: Mon Nov 22 17:58:56 2010 +0100
0.74 bump
.gitignore | 1 +
perl-Padre.spec | 65 +++++++++++++++++++++++++++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 58 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9022786..b9df241 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Padre-0.64.tar.gz
/Padre-0.72.tar.gz
+/Padre-0.74.tar.gz
diff --git a/perl-Padre.spec b/perl-Padre.spec
index 1aad226..b938114 100644
--- a/perl-Padre.spec
+++ b/perl-Padre.spec
@@ -1,6 +1,9 @@
+# Disable X11 tests as there is annoying interactive warning at padre start.
+%global use_x11_tests 0
+
Name: perl-Padre
-Version: 0.72
-Release: 2%{?dist}
+Version: 0.74
+Release: 1%{?dist}
Summary: Perl Application Development and Refactoring Environment
License: GPL+ or Artistic
Group: Development/Libraries
@@ -55,7 +58,7 @@ BuildRequires: perl(IPC::Open2)
BuildRequires: perl(IPC::Open3)
BuildRequires: perl(List::MoreUtils) >= 0.22
BuildRequires: perl(List::Util) >= 1.18
-BuildRequires: perl(Locale::Msgfmt) >= 0.14
+BuildRequires: perl(Locale::Msgfmt) >= 0.15
BuildRequires: perl(LWP) >= 5.815
BuildRequires: perl(Module::Build) >= 0.3603
BuildRequires: perl(Module::CoreList)
@@ -96,6 +99,15 @@ BuildRequires: perl(YAML::Tiny) >= 1.32
BuildRequires: perl(threads) >= 1.71
BuildRequires: perl(threads::shared) >= 1.33
BuildRequires: perl(version) >= 0.80
+%if %{use_x11_tests}
+# X11 tests:
+BuildRequires: perl(App::Prove)
+# Parts of X Window System needed for tests to run:
+BuildRequires: xorg-x11-server-Xvfb
+BuildRequires: xorg-x11-xinit
+BuildRequires: font(:lang=en)
+%endif
+
Requires: perl(App::cpanminus) >= 0.9923
Requires: perl(Class::Adapter) >= 1.05
Requires: perl(Class::Unload) >= 0.03
@@ -198,7 +210,8 @@ in a directory called .padre.
%prep
%setup -q -n Padre-%{version}
-chmod 755 share/examples/*
+find share/{examples,templates} -type f \( -name '*.pl' -o -name '*.t' \) \
+ -exec chmod 755 {} +
%build
@@ -212,26 +225,60 @@ make pure_install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-# languages are in different format than find_lang expects
-#%%find_lang Padre-%%{version}/blib/lib/auto/share/dist/Padre/
+
+# languages are in different format than %%find_lang expects
+find ${RPM_BUILD_ROOT}%{perl_vendorlib}/auto/share/dist/Padre/locale/ \
+ -type f -name '*.mo' | \
+ sed 's|^'"$RPM_BUILD_ROOT"'||
+ s|\(.*/\)\([^.]*\)\(\.mo\)$|%lang(\2) \1\2\3|' > %{name}.lang
%{_fixperms} $RPM_BUILD_ROOT/*
+
%check
-make test
+%if %{use_x11_tests}
+ xinit /usr/bin/make -s test -- /usr/bin/Xvfb :666 |tee testing.TAP
+ prove --exec cat testing.TAP
+%else
+ make test
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc Artistic Changes COPYING padre.yml README
-%{perl_vendorlib}/*
+# To omit %%{perl_vendorlib}/auto/share/dist/Padre/locale/* pulled by -f option
+%dir %{perl_vendorlib}/auto
+%dir %{perl_vendorlib}/auto/share
+%dir %{perl_vendorlib}/auto/share/dist
+%dir %{perl_vendorlib}/auto/share/dist/Padre
+ %{perl_vendorlib}/auto/share/dist/Padre/doc
+ %{perl_vendorlib}/auto/share/dist/Padre/examples
+ %{perl_vendorlib}/auto/share/dist/Padre/icons
+ %{perl_vendorlib}/auto/share/dist/Padre/languages
+%dir %{perl_vendorlib}/auto/share/dist/Padre/locale
+ %{perl_vendorlib}/auto/share/dist/Padre/padre-splash*
+ %{perl_vendorlib}/auto/share/dist/Padre/ppm
+ %{perl_vendorlib}/auto/share/dist/Padre/README.txt
+ %{perl_vendorlib}/auto/share/dist/Padre/styles
+ %{perl_vendorlib}/auto/share/dist/Padre/templates
+ %{perl_vendorlib}/auto/share/dist/Padre/timeline
+%{perl_vendorlib}/Padre*
%{_mandir}/man3/*
%{_bindir}/padre
%changelog
+* Fri Nov 19 2010 Petr Pisar <[email protected]> - 0.74-1
+- 1.74 bump
+- Fix templates file permission
+- Mark translation files with %%lang macro
+- Provide X11 server to run X11 tests (disable the tests for now as there is a
+ bug preventing automation).
+
* Mon Oct 11 2010 Marcela Mašláňpvá <[email protected]> 0.72-2
- apply fix of spec from 633737
diff --git a/sources b/sources
index 9e43805..5406ac9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d187654500fd819a70f8e82052d93db4 Padre-0.72.tar.gz
+714f398c6f5a09d0941e53e751267a6d Padre-0.74.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
