williamjmorenor pushed to todocli (master). "Update Python Macros"
by notificationsï¼ fedoraproject.org
From 777af845d99d09d6ed396d7317934ddaab1a53b5 Mon Sep 17 00:00:00 2001
From: William Moreno <williamjmorenor(a)gmail.com>
Date: Fri, 31 Jul 2015 17:27:50 -0600
Subject: Update Python Macros
diff --git a/todocli.spec b/todocli.spec
index e9d309c..33e7f3e 100644
--- a/todocli.spec
+++ b/todocli.spec
@@ -12,7 +12,7 @@
Name: todocli
Version: 0.1
-Release: %{date}git%{shortcommit}%{?dist}.3
+Release: 1%{date}git%{shortcommit}%{?dist}
Summary: Command line To Do application
License: MIT
@@ -33,10 +33,10 @@ A To Do command line application with SQLite back end written in Python.
rm -rf %{name}.egg.info
%build
-%{__python2} setup.py build --quiet
+%py2_build
%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
mkdir -p %{buildroot}/%{_mandir}/man1
install -p -m 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/
@@ -50,6 +50,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/
%changelog
+* Fri Jul 31 2015 William Moreno Reyes <williamjmorenor(a)gmail.com> - 0.1-120140709gitf50c240
+- Update Python Macros
+
* Thu Jul 16 2015 William Moreno Reyes <williamjmorenor at gmail.com> - 0.1-20140709gitf50c240.3
- Add manpage
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/todocli.git/commit/?h=master&id=777af8...
8Â years, 1Â month
williamjmorenor pushed to python-frappe (f23). "Update to v5.2.2"
by notificationsï¼ fedoraproject.org
From 949fc1526d5b162437851f316a52c3d6af434476 Mon Sep 17 00:00:00 2001
From: William Moreno <williamjmorenor(a)gmail.com>
Date: Fri, 31 Jul 2015 16:57:29 -0600
Subject: Update to v5.2.2
diff --git a/.gitignore b/.gitignore
index 2a503cb..2faa764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/v5.1.3.tar.gz
/v5.1.5.tar.gz
+/v5.2.2.tar.gz
diff --git a/python-frappe.spec b/python-frappe.spec
index 957acb1..82dec43 100644
--- a/python-frappe.spec
+++ b/python-frappe.spec
@@ -3,8 +3,8 @@
%global project frappe
Name: python-%project
-Version: 5.1.5
-Release: 1%{?dist}
+Version: 5.2.2
+Release: 2%{?dist}
Summary: Meta data driven web framework
License: MIT
URL: http://frappe.io/
@@ -115,10 +115,10 @@ rm -f frappe/public/js/lib/prism.js
rm -f frappe/public/js/lib/beautify-html.js
%build
-%{__python2} setup.py build
+%py2_build
%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
#Link .js libraries
ln -sf %{nodejs_sitelib}/flot %{buildroot}/%{python2_sitelib}/frappe/public/js/lib/flot
@@ -179,6 +179,10 @@ exit 0
%dir %{_localstatedir}/frappe-bench/sites
%changelog
+* Fri Jul 31 2015 William Moreno Reyes <williamjmorenor at gmail.com>
+- 5.2.2-2
+- Update Python macros
+
* Wed Jul 29 2015 William Moreno Reyes <williamjmorenor at gmail.com>
- 5.1.5-1
- Update to v5.1.5 release
diff --git a/sources b/sources
index cb14fe2..052b251 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92c660ded720559ac5ce6fa13fec43c4 v5.1.5.tar.gz
+74d222cb4bf6f2fdd8074428cb30a59d v5.2.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/python-frappe.git/commit/?h=f23&id=949...
8Â years, 1Â month
williamjmorenor pushed to python-frappe (master). "Update to v5.2.2"
by notificationsï¼ fedoraproject.org
From 949fc1526d5b162437851f316a52c3d6af434476 Mon Sep 17 00:00:00 2001
From: William Moreno <williamjmorenor(a)gmail.com>
Date: Fri, 31 Jul 2015 16:57:29 -0600
Subject: Update to v5.2.2
diff --git a/.gitignore b/.gitignore
index 2a503cb..2faa764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/v5.1.3.tar.gz
/v5.1.5.tar.gz
+/v5.2.2.tar.gz
diff --git a/python-frappe.spec b/python-frappe.spec
index 957acb1..82dec43 100644
--- a/python-frappe.spec
+++ b/python-frappe.spec
@@ -3,8 +3,8 @@
%global project frappe
Name: python-%project
-Version: 5.1.5
-Release: 1%{?dist}
+Version: 5.2.2
+Release: 2%{?dist}
Summary: Meta data driven web framework
License: MIT
URL: http://frappe.io/
@@ -115,10 +115,10 @@ rm -f frappe/public/js/lib/prism.js
rm -f frappe/public/js/lib/beautify-html.js
%build
-%{__python2} setup.py build
+%py2_build
%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
#Link .js libraries
ln -sf %{nodejs_sitelib}/flot %{buildroot}/%{python2_sitelib}/frappe/public/js/lib/flot
@@ -179,6 +179,10 @@ exit 0
%dir %{_localstatedir}/frappe-bench/sites
%changelog
+* Fri Jul 31 2015 William Moreno Reyes <williamjmorenor at gmail.com>
+- 5.2.2-2
+- Update Python macros
+
* Wed Jul 29 2015 William Moreno Reyes <williamjmorenor at gmail.com>
- 5.1.5-1
- Update to v5.1.5 release
diff --git a/sources b/sources
index cb14fe2..052b251 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92c660ded720559ac5ce6fa13fec43c4 v5.1.5.tar.gz
+74d222cb4bf6f2fdd8074428cb30a59d v5.2.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/python-frappe.git/commit/?h=master&id=...
8Â years, 1Â month
williamjmorenor pushed to mkdocs (master). "Update Python macros"
by notificationsï¼ fedoraproject.org
From c9e17cfad3c80d284579de16bf1f08e50dc44c99 Mon Sep 17 00:00:00 2001
From: William Moreno <williamjmorenor(a)gmail.com>
Date: Fri, 31 Jul 2015 16:37:29 -0600
Subject: Update Python macros
diff --git a/mkdocs.spec b/mkdocs.spec
index ecfd799..2f5fee0 100644
--- a/mkdocs.spec
+++ b/mkdocs.spec
@@ -1,6 +1,6 @@
Name: mkdocs
Version: 0.14.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Python tool to create HTML documentation from markdown sources
License: BSD
@@ -57,10 +57,10 @@ rm -rf mkdocs/themes/*/js/highlight.pack.js
sed -i 1d %{_builddir}/%{name}-%{version}/%{name}/utils/ghp_import.py
%build
-%{__python3} setup.py build
+%py3_build
%install
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%py3_install
mkdir -p %{buildroot}/%{_mandir}/man1
install -p -m 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/
@@ -93,6 +93,10 @@ done
%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
%changelog
+* Fri Jul 31 2015 Fedora <williamjmorenor(a)gmail.com>
+- 0.14.0-6
+- Update Python macros
+
* Mon Jul 27 2015 William Moreno Reyes <williamjmorenor at gmail.com>
- 0.14.0-5
- Initial import of #1230963
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mkdocs.git/commit/?h=master&id=c9e17cf...
8Â years, 1Â month
williamjmorenor pushed to mkdocs (f23). "Update Python macros"
by notificationsï¼ fedoraproject.org
From c9e17cfad3c80d284579de16bf1f08e50dc44c99 Mon Sep 17 00:00:00 2001
From: William Moreno <williamjmorenor(a)gmail.com>
Date: Fri, 31 Jul 2015 16:37:29 -0600
Subject: Update Python macros
diff --git a/mkdocs.spec b/mkdocs.spec
index ecfd799..2f5fee0 100644
--- a/mkdocs.spec
+++ b/mkdocs.spec
@@ -1,6 +1,6 @@
Name: mkdocs
Version: 0.14.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Python tool to create HTML documentation from markdown sources
License: BSD
@@ -57,10 +57,10 @@ rm -rf mkdocs/themes/*/js/highlight.pack.js
sed -i 1d %{_builddir}/%{name}-%{version}/%{name}/utils/ghp_import.py
%build
-%{__python3} setup.py build
+%py3_build
%install
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%py3_install
mkdir -p %{buildroot}/%{_mandir}/man1
install -p -m 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/
@@ -93,6 +93,10 @@ done
%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
%changelog
+* Fri Jul 31 2015 Fedora <williamjmorenor(a)gmail.com>
+- 0.14.0-6
+- Update Python macros
+
* Mon Jul 27 2015 William Moreno Reyes <williamjmorenor at gmail.com>
- 0.14.0-5
- Initial import of #1230963
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mkdocs.git/commit/?h=f23&id=c9e17cfad3...
8Â years, 1Â month
amigadave pushed to tracker (f22). "Update to 1.4.1"
by notificationsï¼ fedoraproject.org
From 113c6a1a9dc82f186fd958bb4329012876d6d943 Mon Sep 17 00:00:00 2001
From: David King <amigadave(a)amigadave.com>
Date: Fri, 31 Jul 2015 23:04:41 +0100
Subject: Update to 1.4.1
diff --git a/sources b/sources
index 19000f8..07660f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31419ccdb03c1bc2fa7762835936656c tracker-1.4.0.tar.xz
+0b3bf0196f679b6a1e9e2af9025da8cd tracker-1.4.1.tar.xz
diff --git a/tracker.spec b/tracker.spec
index 259cbbf..13cebd8 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -15,7 +15,7 @@
%endif
Name: tracker
-Version: 1.4.0
+Version: 1.4.1
Release: 1%{?dist}
Summary: Desktop-neutral search tool and indexer
@@ -264,7 +264,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/girepository-1.0/TrackerControl-1.0.typelib
%{_libdir}/girepository-1.0/TrackerMiner-1.0.typelib
%{_mandir}/*/tracker*.gz
-%{_sysconfdir}/bash_completion.d/tracker-prompt.sh
+%{_datadir}/bash-completion/completions/%{name}
%config(noreplace) %{_sysconfdir}/xdg/autostart/tracker*.desktop
%{_datadir}/glib-2.0/schemas/*
%exclude %{_bindir}/tracker-needle
@@ -323,6 +323,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Jul 31 2015 David King <amigadave(a)amigadave.com> - 1.4.1-1
+- Update to 1.4.1
+
* Tue Mar 24 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.4.0-1
- Update to 1.4.0
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/tracker.git/commit/?h=f22&id=113c6a1a9...
8Â years, 1Â month
smani pushed to devscripts (f23). "Fix licensecheck incorrectly
detecting mime strings such as text/x-c++ as a binary file (#1249227)"
by notificationsï¼ fedoraproject.org
From 81b2b4bba40c521e1812613d1bc20829b136f560 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Sat, 1 Aug 2015 00:05:29 +0200
Subject: Fix licensecheck incorrectly detecting mime strings such as
text/x-c++ as a binary file (#1249227)
diff --git a/devscripts.spec b/devscripts.spec
index 95a272a..9a9aba4 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,6 +1,6 @@
Name: devscripts
Version: 2.15.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Scripts for Debian Package maintainers
License: GPLv2+
@@ -12,6 +12,8 @@ Patch0: devscripts_docbook.patch
Patch1: devscripts_install-layout.patch
# Install some additional man pages
Patch2: devscripts_install-man.patch
+# Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file
+Patch3: devscripts_licensecheck.patch
# rpmdevtools < 8.4 bundled some of the scripts provided by this package
Conflicts: rpmdevtools < 8.4
@@ -108,6 +110,7 @@ This package contains the following subset of the devscripts scripts:
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
@@ -159,6 +162,9 @@ ln -s %{_mandir}/man1/pts-subscribe.1.gz %{buildroot}%{_mandir}/man1/pts-unsubsc
%changelog
+* Sat Aug 01 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-2
+- Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227)
+
* Wed Jul 29 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-1
- Update to 2.15.6
diff --git a/devscripts_licensecheck.patch b/devscripts_licensecheck.patch
index 0a7fbf7..0beabab 100644
--- a/devscripts_licensecheck.patch
+++ b/devscripts_licensecheck.patch
@@ -1,23 +1,12 @@
-diff -rupN devscripts-2.15.5/scripts/licensecheck.pl devscripts-2.15.5-new/scripts/licensecheck.pl
---- devscripts-2.15.5/scripts/licensecheck.pl 2015-06-11 05:14:09.000000000 +0200
-+++ devscripts-2.15.5-new/scripts/licensecheck.pl 2015-07-09 19:49:18.917819318 +0200
-@@ -321,13 +321,15 @@ while (@files) {
- my %copyrights;
-
+diff -rupN devscripts-2.15.6/scripts/licensecheck.pl devscripts-2.15.6-new/scripts/licensecheck.pl
+--- devscripts-2.15.6/scripts/licensecheck.pl 2015-07-28 05:15:12.000000000 +0200
++++ devscripts-2.15.6-new/scripts/licensecheck.pl 2015-08-01 00:02:21.376875372 +0200
+@@ -323,7 +323,7 @@ while (@files) {
# Encode::Guess does not work well, use good old file command to get file encoding
-- my $mime = `file -bi $file`;
-+ my $mime = `file --brief --mime --dereference $file`;
+ my $mime = `file --brief --mime --dereference $file`;
my $charset ;
-- if ($mime =~ /charset=([\w-]+)/) {
-- $charset = $1;
-+ if ($mime =~ m!text/\w+; charset=([\w-]+)!) {
-+ $charset = $1;
+- if ($mime =~ m!(?:text/[\w-]+|application/xml); charset=([\w-]+)!) {
++ if ($mime =~ m!(?:text/[\w-\+]+|application/xml); charset=([\w-]+)!) {
+ $charset = $1;
}
else {
-- die "can't find charset of $file\n";
-+ chomp $mime;
-+ warn "$0 warning: cannot parse file '$file' with mime type '$mime'\n";
-+ next;
- }
-
- open (my $F, '<' ,$file) or die "Unable to access $file\n";
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/devscripts.git/commit/?h=f23&id=81b2b4...
8Â years, 1Â month
smani pushed to devscripts (f22). "Fix licensecheck incorrectly
detecting mime strings such as text/x-c++ as a binary file (#1249227)"
by notificationsï¼ fedoraproject.org
From 81b2b4bba40c521e1812613d1bc20829b136f560 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Sat, 1 Aug 2015 00:05:29 +0200
Subject: Fix licensecheck incorrectly detecting mime strings such as
text/x-c++ as a binary file (#1249227)
diff --git a/devscripts.spec b/devscripts.spec
index 95a272a..9a9aba4 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,6 +1,6 @@
Name: devscripts
Version: 2.15.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Scripts for Debian Package maintainers
License: GPLv2+
@@ -12,6 +12,8 @@ Patch0: devscripts_docbook.patch
Patch1: devscripts_install-layout.patch
# Install some additional man pages
Patch2: devscripts_install-man.patch
+# Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file
+Patch3: devscripts_licensecheck.patch
# rpmdevtools < 8.4 bundled some of the scripts provided by this package
Conflicts: rpmdevtools < 8.4
@@ -108,6 +110,7 @@ This package contains the following subset of the devscripts scripts:
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
@@ -159,6 +162,9 @@ ln -s %{_mandir}/man1/pts-subscribe.1.gz %{buildroot}%{_mandir}/man1/pts-unsubsc
%changelog
+* Sat Aug 01 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-2
+- Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227)
+
* Wed Jul 29 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-1
- Update to 2.15.6
diff --git a/devscripts_licensecheck.patch b/devscripts_licensecheck.patch
index 0a7fbf7..0beabab 100644
--- a/devscripts_licensecheck.patch
+++ b/devscripts_licensecheck.patch
@@ -1,23 +1,12 @@
-diff -rupN devscripts-2.15.5/scripts/licensecheck.pl devscripts-2.15.5-new/scripts/licensecheck.pl
---- devscripts-2.15.5/scripts/licensecheck.pl 2015-06-11 05:14:09.000000000 +0200
-+++ devscripts-2.15.5-new/scripts/licensecheck.pl 2015-07-09 19:49:18.917819318 +0200
-@@ -321,13 +321,15 @@ while (@files) {
- my %copyrights;
-
+diff -rupN devscripts-2.15.6/scripts/licensecheck.pl devscripts-2.15.6-new/scripts/licensecheck.pl
+--- devscripts-2.15.6/scripts/licensecheck.pl 2015-07-28 05:15:12.000000000 +0200
++++ devscripts-2.15.6-new/scripts/licensecheck.pl 2015-08-01 00:02:21.376875372 +0200
+@@ -323,7 +323,7 @@ while (@files) {
# Encode::Guess does not work well, use good old file command to get file encoding
-- my $mime = `file -bi $file`;
-+ my $mime = `file --brief --mime --dereference $file`;
+ my $mime = `file --brief --mime --dereference $file`;
my $charset ;
-- if ($mime =~ /charset=([\w-]+)/) {
-- $charset = $1;
-+ if ($mime =~ m!text/\w+; charset=([\w-]+)!) {
-+ $charset = $1;
+- if ($mime =~ m!(?:text/[\w-]+|application/xml); charset=([\w-]+)!) {
++ if ($mime =~ m!(?:text/[\w-\+]+|application/xml); charset=([\w-]+)!) {
+ $charset = $1;
}
else {
-- die "can't find charset of $file\n";
-+ chomp $mime;
-+ warn "$0 warning: cannot parse file '$file' with mime type '$mime'\n";
-+ next;
- }
-
- open (my $F, '<' ,$file) or die "Unable to access $file\n";
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/devscripts.git/commit/?h=f22&id=81b2b4...
8Â years, 1Â month
smani pushed to devscripts (f21). "Fix licensecheck incorrectly
detecting mime strings such as text/x-c++ as a binary file (#1249227)"
by notificationsï¼ fedoraproject.org
From 81b2b4bba40c521e1812613d1bc20829b136f560 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Sat, 1 Aug 2015 00:05:29 +0200
Subject: Fix licensecheck incorrectly detecting mime strings such as
text/x-c++ as a binary file (#1249227)
diff --git a/devscripts.spec b/devscripts.spec
index 95a272a..9a9aba4 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,6 +1,6 @@
Name: devscripts
Version: 2.15.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Scripts for Debian Package maintainers
License: GPLv2+
@@ -12,6 +12,8 @@ Patch0: devscripts_docbook.patch
Patch1: devscripts_install-layout.patch
# Install some additional man pages
Patch2: devscripts_install-man.patch
+# Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file
+Patch3: devscripts_licensecheck.patch
# rpmdevtools < 8.4 bundled some of the scripts provided by this package
Conflicts: rpmdevtools < 8.4
@@ -108,6 +110,7 @@ This package contains the following subset of the devscripts scripts:
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
@@ -159,6 +162,9 @@ ln -s %{_mandir}/man1/pts-subscribe.1.gz %{buildroot}%{_mandir}/man1/pts-unsubsc
%changelog
+* Sat Aug 01 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-2
+- Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227)
+
* Wed Jul 29 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-1
- Update to 2.15.6
diff --git a/devscripts_licensecheck.patch b/devscripts_licensecheck.patch
index 0a7fbf7..0beabab 100644
--- a/devscripts_licensecheck.patch
+++ b/devscripts_licensecheck.patch
@@ -1,23 +1,12 @@
-diff -rupN devscripts-2.15.5/scripts/licensecheck.pl devscripts-2.15.5-new/scripts/licensecheck.pl
---- devscripts-2.15.5/scripts/licensecheck.pl 2015-06-11 05:14:09.000000000 +0200
-+++ devscripts-2.15.5-new/scripts/licensecheck.pl 2015-07-09 19:49:18.917819318 +0200
-@@ -321,13 +321,15 @@ while (@files) {
- my %copyrights;
-
+diff -rupN devscripts-2.15.6/scripts/licensecheck.pl devscripts-2.15.6-new/scripts/licensecheck.pl
+--- devscripts-2.15.6/scripts/licensecheck.pl 2015-07-28 05:15:12.000000000 +0200
++++ devscripts-2.15.6-new/scripts/licensecheck.pl 2015-08-01 00:02:21.376875372 +0200
+@@ -323,7 +323,7 @@ while (@files) {
# Encode::Guess does not work well, use good old file command to get file encoding
-- my $mime = `file -bi $file`;
-+ my $mime = `file --brief --mime --dereference $file`;
+ my $mime = `file --brief --mime --dereference $file`;
my $charset ;
-- if ($mime =~ /charset=([\w-]+)/) {
-- $charset = $1;
-+ if ($mime =~ m!text/\w+; charset=([\w-]+)!) {
-+ $charset = $1;
+- if ($mime =~ m!(?:text/[\w-]+|application/xml); charset=([\w-]+)!) {
++ if ($mime =~ m!(?:text/[\w-\+]+|application/xml); charset=([\w-]+)!) {
+ $charset = $1;
}
else {
-- die "can't find charset of $file\n";
-+ chomp $mime;
-+ warn "$0 warning: cannot parse file '$file' with mime type '$mime'\n";
-+ next;
- }
-
- open (my $F, '<' ,$file) or die "Unable to access $file\n";
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/devscripts.git/commit/?h=f21&id=81b2b4...
8Â years, 1Â month