commit b08dd97827b19eaaf71aaa26c4a48bc36a6ba4a0
Author: Jakub Bogusz <[email protected]>
Date: Sat Dec 26 09:02:49 2015 +0100
- libquvi-scripts 0.4 for older software and license compatibility (e.g.
ffmpeg)
- added scriptsdir to adjust scriptsdir to be parallel installable with
0.9.x
libquvi-scripts-0.4-scriptsdir.patch | 31 +++++++++++++++++
libquvi-scripts-0.4.spec | 65 +++++++++++++++++++++++++++++++++++
libquvi-scripts.spec | 66 ------------------------------------
3 files changed, 96 insertions(+), 66 deletions(-)
---
diff --git a/libquvi-scripts-0.4.spec b/libquvi-scripts-0.4.spec
new file mode 100644
index 0000000..1711183
--- /dev/null
+++ b/libquvi-scripts-0.4.spec
@@ -0,0 +1,65 @@
+Summary: Embedded lua scripts that libquvi 0.4.x uses for parsing the
media details
+Summary(pl.UTF-8): Skrypty osadzonego lua wykorzystywane przez libquvi
0.4.x do analizy multimediów
+Name: libquvi-scripts-0.4
+Version: 0.4.21
+Release: 1
+License: LGPL v2.1+
+Group: Applications
+Source0:
http://downloads.sourceforge.net/quvi/libquvi-scripts-%{version}.tar.xz
+# Source0-md5: 2690c995b7cd6193cbc774a7d89a885c
+Patch0: %{name}-scriptsdir.patch
+URL: http://quvi.sourceforge.net/
+BuildRequires: autoconf >= 2.67
+BuildRequires: automake
+BuildRequires: rpmbuild(macros) >= 1.446
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This package contains embedded lua scripts that libquvi 0.4.x uses for
+parsing the media details.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera skrypty osadzonego lua, wykorzystywane przez
+libquvi 0.4.x przy analizie szczegółów danych multimedialnych.
+
+%prep
+%setup -q -n libquvi-scripts-%{version}
+%patch0 -p1
+
+%build
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+%configure \
+ --disable-silent-rules \
+ --with-nsfw \
+ --with-nlfy
+#%if "%{_gnu}" != "-gnux32"
+# --build=%{_host} \
+# --host=%{_host} \
+#%endif
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ pkgconfigdir=%{_npkgconfigdir}
+
+# packaged in libquvi-scripts 0.9
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/libquvi-scripts.7
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README
+%dir %{_datadir}/libquvi-scripts
+%{_datadir}/libquvi-scripts/0.4
+%{_npkgconfigdir}/libquvi-scripts.pc
diff --git a/libquvi-scripts.spec b/libquvi-scripts.spec
deleted file mode 100644
index 207a718..0000000
--- a/libquvi-scripts.spec
+++ /dev/null
@@ -1,66 +0,0 @@
-Summary: Embedded lua scripts that libquvi uses for parsing the media
details
-Summary(pl.UTF-8): Skrypty osadzonego lua wykorzystywane przez libquvi do
analizy multimediów
-Name: libquvi-scripts
-Version: 0.9.20131130
-Release: 1
-License: AGPL v3+
-Group: Applications
-Source0: http://downloads.sourceforge.net/quvi/%{name}-%{version}.tar.xz
-# Source0-md5: 46ddfd887260a515199c2e1ba8c46d8a
-URL: http://quvi.sourceforge.net/
-BuildRequires: asciidoc
-BuildRequires: autoconf >= 2.69
-BuildRequires: automake >= 1:1.11.1
-BuildRequires: libtool >= 2:2.2.6
-BuildRequires: rpmbuild(macros) >= 1.446
-BuildRequires: tar >= 1:1.22
-BuildRequires: xz
-# build process and tests aren't noarch, but built package is
-BuildArch: noarch
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-This package contains embedded lua scripts that libquvi uses for
-parsing the media details.
-
-%description -l pl.UTF-8
-Ten pakiet zawiera skrypty osadzonego lua, wykorzystywane przez
-libquvi przy analizie szczegółów danych multimedialnych.
-
-%prep
-%setup -q
-
-%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-%if "%{_gnu}" != "-gnux32"
- --build=%{_host} \
- --host=%{_host} \
-%endif
- --disable-silent-rules \
- --with-nsfw \
- --with-nlfy
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- pkgconfigdir=%{_npkgconfigdir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%{_datadir}/%{name}
-%{_mandir}/man7/libquvi-scripts.7*
-%{_mandir}/man7/quvi-modules.7*
-%{_mandir}/man7/quvi-modules-3rdparty.7*
-%{_npkgconfigdir}/libquvi-scripts-0.9.pc
diff --git a/libquvi-scripts-0.4-scriptsdir.patch
b/libquvi-scripts-0.4-scriptsdir.patch
new file mode 100644
index 0000000..038afb1
--- /dev/null
+++ b/libquvi-scripts-0.4-scriptsdir.patch
@@ -0,0 +1,31 @@
+--- libquvi-scripts-0.4.21/libquvi-scripts.pc.in.orig 2013-11-30
16:50:24.000000000 +0100
++++ libquvi-scripts-0.4.21/libquvi-scripts.pc.in 2015-12-26
08:51:27.051424300 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-scriptsdir=@datadir@/libquvi-scripts
++scriptsdir=@datadir@/libquvi-scripts/0.4
+ versionfile=${scriptsdir}/version
+
+ Name: libquvi-scripts
+--- libquvi-scripts-0.4.21/share/Makefile.am.orig 2013-11-30
16:50:24.000000000 +0100
++++ libquvi-scripts-0.4.21/share/Makefile.am 2015-12-26 08:52:47.591420925
+0100
+@@ -92,5 +92,6 @@
+ endif
+ endif # WITH_FIXME
+
+-nobase_dist_pkgdata_DATA= $(DIST_lua)
++pkgverdatadir = $(pkgdatadir)/0.4
++nobase_dist_pkgverdata_DATA= $(DIST_lua)
+ EXTRA_DIST= $(DIST_lua)
+--- libquvi-scripts-0.4.21/share/lua/Makefile.am.orig 2013-11-30
16:50:24.000000000 +0100
++++ libquvi-scripts-0.4.21/share/lua/Makefile.am 2015-12-26
08:53:16.798086532 +0100
+@@ -1,5 +1,6 @@
+
+-nobase_dist_pkgdata_DATA= version
++pkgverdatadir = $(pkgdatadir)/0.4
++nobase_dist_pkgverdata_DATA= version
+ DISTCLEANFILES= version
+ EXTRA_DIST= version
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libquvi-scripts-0.4.git/commitdiff/b08dd97827b19eaaf71aaa26c4a48bc36a6ba4a0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
