diff --git a/no-copy-dt-needed-entries.patch b/no-copy-dt-needed-entries.patch new file mode 100644 index 0000000..49efd1c --- /dev/null +++ b/no-copy-dt-needed-entries.patch @@ -0,0 +1,8 @@ +--- src/player/gstreamer/CMakeLists.txt.orig 2009-02-26 00:46:17.000000000 +0200 ++++ src/player/gstreamer/CMakeLists.txt 2011-12-05 23:32:50.194585780 +0200 +@@ -1,4 +1,5 @@ + # TODO WHY AREN'T THESE INCLUDED BY MACRO_OPTIONAL_FIND_PACKAGE( GStreamer )? ++FIND_PACKAGE( GObject REQUIRED ) + FIND_PACKAGE( GLIB2 REQUIRED ) + FIND_PACKAGE( LibXml2 REQUIRED ) + diff --git a/subtitlecomposer.changes b/subtitlecomposer.changes index 22a743f..08e2094 100644 --- a/subtitlecomposer.changes +++ b/subtitlecomposer.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 5 21:47:07 UTC 2011 - asterios.dramis@gmail.com + +- Added a patch (no-copy-dt-needed-entries.patch) to fix linking with + --no-copy-dt-needed-entries. +- Spec file updates: + * Changes based on spec-cleaner run. + * Changed License: to GPL-2.0+ (SPDX style). + ------------------------------------------------------------------- Thu Jun 2 18:40:29 UTC 2011 - asterios.dramis@gmail.com diff --git a/subtitlecomposer.spec b/subtitlecomposer.spec index 07cc697..a191f0c 100644 --- a/subtitlecomposer.spec +++ b/subtitlecomposer.spec @@ -15,41 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: subtitlecomposer Version: 0.5.3 Release: 1 +License: GPL-2.0+ Summary: A text-based subtitle editor - -License: GPLv2+ Url: http://subcomposer.sourceforge.net/ Group: Productivity/Multimedia/Video/Editors and Convertors Source0: http://prdownloads.sourceforge.net/subcomposer/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM subtitlecomposer-linkage.patch -- from upstream SVN, remove in next version -Patch0: %{name}-linkage.patch +Patch0: subtitlecomposer-linkage.patch # PATCH-FIX-UPSTREAM subtitlecomposer-0.5.3-scripting_api.patch https://sf.net/tracker/?func=detail&aid=2816725&group_id=208427&atid=1005652 cmorve69@yahoo.es -- fixes installation of broken symlinks -Patch1: %{name}-%{version}-scripting_api.patch +Patch1: subtitlecomposer-0.5.3-scripting_api.patch # PATCH-FIX-UPSTREAM subtitlecomposer-0.5.3-gcc45.patch -- from upstream SVN, remove in next version -Patch2: %{name}-%{version}-gcc45.patch +Patch2: subtitlecomposer-0.5.3-gcc45.patch # PATCH-FIX-UPSTREAM scripting_examples_installation.patch asterios.dramis@gmail.com -- Fix installation of python scripting examples Patch3: scripting_examples_installation.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +# PATCH-FIX-OPENSUSE no-copy-dt-needed-entries.patch asterios.dramis@gmail.com -- Fix linking with --no-copy-dt-needed-entries +Patch4: no-copy-dt-needed-entries.patch BuildRequires: fdupes -BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel # src/main/utils/translator.cpp:223 uses KIO::TransferJob::setTotalSize, # available since 4.2.1 BuildRequires: libkde4-devel > 4.2.1 BuildRequires: libxine-devel +BuildRequires: pkgconfig(gstreamer-0.10) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -%kde4_runtime_requires +Recommends: %{name}-lang = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info Requires(postun): shared-mime-info -Recommends: %{name}-lang = %{version} +%kde4_runtime_requires %description A text-based subtitles editor that supports basic operations as well as more @@ -64,6 +62,7 @@ every platform supported by KDE. %patch1 %patch2 %patch3 +%patch4 # PATCH-FIX-UPSTREAM prep_section_changes https://sourceforge.net/tracker/?func=detail&aid=2817615&group_id=208427&atid=1005652 cmorve69@yahoo.es -- fixes the installation path of icons mv src/main/images/hi48-app-mediaplayer.png src/main/images/hi96-app-mediaplayer.png mv src/main/images/hi48-app-mediaplayer-closed.png src/main/images/hi64-app-mediaplayer.png @@ -78,12 +77,17 @@ chmod 644 ChangeLog cd build %kde4_makeinstall cd .. + %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Qt KDE AudioVideo AudioVideoEditing %endif + %fdupes -s %{buildroot}%{_datadir} + %find_lang %{name} + %kde_post_install + # Fix persissions chmod 755 %{buildroot}%{_kde4_appsdir}/%{name}/scripts/*.py chmod 755 %{buildroot}%{_kde4_appsdir}/%{name}/scripts/*.rb @@ -100,9 +104,6 @@ perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroo %postun /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog TODO files_for_doc/api