[packages/php-pecl-ktaglib] add changes from ktaglib pecl svn, set version to 0.3.0
glen
glen at pld-linux.org
Sat May 17 13:24:44 CEST 2014
commit e22e0dc0e716592366b607f663301ef094e2c726
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat May 17 14:23:29 2014 +0300
add changes from ktaglib pecl svn, set version to 0.3.0
branch.sh | 25 +++++++++++++++++++++++++
php-pecl-ktaglib.spec | 32 ++++++++++++++++++--------------
prepatch.patch | 12 ++++++++++++
3 files changed, 55 insertions(+), 14 deletions(-)
---
diff --git a/php-pecl-ktaglib.spec b/php-pecl-ktaglib.spec
index 24ad54e..ff55c52 100644
--- a/php-pecl-ktaglib.spec
+++ b/php-pecl-ktaglib.spec
@@ -1,23 +1,25 @@
%define php_name php%{?php_suffix}
-%define modname KTagLib
-%define modname2 ktaglib
+%define modname ktaglib
%define status beta
Summary: library to edit audio properties and tags on MPEG and OGG files
Summary(pl.UTF-8): biblioteka do edycji informacji w plikach MPEG i OGG
-Name: %{php_name}-pecl-%{modname2}
-Version: 0.2.0
-Release: 8
+Name: %{php_name}-pecl-%{modname}
+Version: 0.3.0
+Release: 1
License: Modified BSD
Group: Development/Languages/PHP
-Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
+Source0: http://pecl.php.net/get/KTagLib-0.2.0.tgz
# Source0-md5: 8c363e8c96eedd21ea652b280369d59b
+Patch0: prepatch.patch
+Patch1: branch.diff
+# Patch1-md5: 538316f99b911d2820c1bc2692a31289
URL: http://pecl.php.net/package/KTaglib/
BuildRequires: %{php_name}-devel >= 3:5.0.4
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: taglib-devel >= 1.5
%{?requires_php_extension}
-Provides: php(%{modname}) = %{version}
+Provides: php(KTagLib) = %{version}
Obsoletes: php-pecl-ktaglib < 0.2.0-7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,8 +36,10 @@ zapis metadanych w róznych plikach audio.
To rozszerzenie ma w PECL status: %{status}.
%prep
-%setup -q -c
-mv KTaglib-%{version}/* .
+%setup -qc
+mv KTaglib-*/* .
+%patch0 -p1
+%patch1 -p0
%build
phpize
@@ -49,9 +53,9 @@ install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
%{__make} install \
INSTALL_ROOT=$RPM_BUILD_ROOT \
EXTENSION_DIR=%{php_extensiondir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname2}.ini
-; Enable %{modname2} extension module
-extension=%{modname2}.so
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
+; Enable %{modname} extension module
+extension=%{modname}.so
EOF
%clean
@@ -68,5 +72,5 @@ fi
%files
%defattr(644,root,root,755)
%doc README
-%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname2}.ini
-%attr(755,root,root) %{php_extensiondir}/%{modname2}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{modname}.so
diff --git a/branch.sh b/branch.sh
new file mode 100755
index 0000000..c34545b
--- /dev/null
+++ b/branch.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+pecl=ktaglib
+svn=http://svn.php.net/repository/pecl/$pecl
+tag=RELEASE_0_2_0
+out=branch.diff
+
+d=$-
+filter() {
+ set -$d
+ # remove revno's for smaller diffs
+ sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
+}
+
+old=$svn/tags/$tag
+new=$svn/trunk
+echo >&2 "Running diff: $old -> $new"
+LC_ALL=C svn diff --old=$old --new=$new | filter > $out.tmp
+
+if cmp -s $out{,.tmp}; then
+ echo >&2 "No new diffs..."
+ rm -f $out.tmp
+ exit 0
+fi
+mv -f $out{.tmp,}
diff --git a/prepatch.patch b/prepatch.patch
new file mode 100644
index 0000000..99f3a8a
--- /dev/null
+++ b/prepatch.patch
@@ -0,0 +1,12 @@
+patch to make svn diffs to apply
+--- php53-pecl-ktaglib-0.2.0/php_ktaglib.h~ 2014-05-17 14:17:41.000000000 +0300
++++ php53-pecl-ktaglib-0.2.0/php_ktaglib.h 2014-05-17 14:18:32.886724388 +0300
+@@ -35,7 +35,7 @@
+ #ifndef PHP_KTAGLIB_H
+ #define PHP_KTAGLIB_H
+
+-#define PHP_KTAGLIB_VERSION "0.2.0"
++#define PHP_KTAGLIB_VERSION "0.0.1-dev"
+
+ #ifdef __cplusplus
+ extern "C" {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-ktaglib.git/commitdiff/e22e0dc0e716592366b607f663301ef094e2c726
More information about the pld-cvs-commit
mailing list