Accepting request 209449 from home:adra:branches:KDE:Extra

Update to 0.5.6 - Continuation of original package since initial author stopped development, Added libicu-devel build requirement, Removed all previous patches (fixed upstream)

OBS-URL: https://build.opensuse.org/request/show/209449
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/subtitlecomposer?expand=0&rev=6
This commit is contained in:
OBS User mrdocs 2013-12-05 09:38:50 +00:00 committed by Git OBS Bridge
parent 019ba09fbb
commit c9fa2cb6c1
9 changed files with 35 additions and 104 deletions

View File

@ -1,24 +0,0 @@
--- 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 )
--- src/player/xine/CMakeLists.txt.orig 2009-02-26 00:46:16.000000000 +0200
+++ src/player/xine/CMakeLists.txt 2012-01-29 16:42:26.646039339 +0200
@@ -1,3 +1,5 @@
+FIND_PACKAGE( X11 REQUIRED )
+
SET( players_xine_INCLUDE_DIR
${XINE_INCLUDE_DIR}
CACHE INTERNAL EXPORTEDVARIABLE
@@ -10,6 +12,7 @@
SET( players_xine_LIBS
${XINE_LIBRARY}
+ ${X11_X11_LIB}
CACHE INTERNAL EXPORTEDVARIABLE
)

View File

@ -1,11 +0,0 @@
--- src/main/scripting/examples/CMakeLists.txt 2009-05-25 01:54:19.000000000 +0300
+++ src/main/scripting/examples/CMakeLists.txt.new 2011-01-18 21:52:09.894896611 +0200
@@ -1,7 +1,7 @@
ADD_SUBDIRECTORY( api )
FILE( GLOB ruby_examples *.rb )
-FILE( GLOB python_examples *.rb )
+FILE( GLOB python_examples *.py )
FILE( GLOB javascript_examples *.js )
INSTALL(

View File

@ -1,13 +0,0 @@
Index: src/core/sstring.cpp
===================================================================
--- src/core/sstring.cpp.orig
+++ src/core/sstring.cpp
@@ -1112,7 +1112,7 @@ SStringList::SStringList( const SString&
append( str );
}
-SStringList::SStringList( const SStringList::SStringList& list ):
+SStringList::SStringList( const SStringList& list ):
QList<SString>( list )
{
}

View File

@ -1,8 +0,0 @@
--- src/main/scripting/examples/api/CMakeLists.txt
+++ src/main/scripting/examples/api/CMakeLists.txt
@@ -1,4 +1,4 @@
-FILE( GLOB header_files *.h )
+FILE( GLOB header_files ../../scripting_*.h )
INSTALL(
FILES

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87f3831b5ae09f4ffcefe586cd3b04b197784bf09652b02518b24a12fde2cad0
size 344295

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f55f3330e72a9a9f19f00674651d7d4c6cd7e19993a14d1deedfa6d34737cf0f
size 1489710

View File

@ -1,12 +0,0 @@
--- src/main/CMakeLists.txt 2009/04/17 19:28:30 16
+++ src/main/CMakeLists.txt 2009/06/08 21:06:44 24
@@ -46,7 +46,9 @@
${KDE4_KDEUI_LIBS}
${KDE4_KHTML_LIBS}
${KDE4_KFILE_LIBS}
+ ${KDE4_KROSSCORE_LIBS}
${KDE4_KROSSUI_LIBS}
+ ${KDE4_PHONON_LIBS}
${common_LIBS}
${config_LIBS}
${core_LIBS}

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Dec 4 20:34:36 UTC 2013 - asterios.dramis@gmail.com
- Update to 0.5.6
# Continuation of original package since initial author stopped development
* SubStation Alpha format fixes and color support
* source cleanup
From 0.5.5:
* text color support
* SubRip text color support
* reworked MicroDVD open/save
From 0.5.4:
* mplayer2 support
* mplayer VDPAU decoding support
* minor cmake build fixes
- Added libicu-devel build requirement.
- Removed all previous patches (fixed upstream).
-------------------------------------------------------------------
Sun Jan 29 15:08:50 UTC 2012 - asterios.dramis@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package subtitlecomposer
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,38 +16,28 @@
#
Name: subtitlecomposer
Version: 0.5.3
Release: 1
Version: 0.5.6
Release: 0
License: GPL-2.0+
Summary: A text-based subtitle editor
Url: http://subcomposer.sourceforge.net/
Url: https://github.com/maxrd2/subtitlecomposer/
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: 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: subtitlecomposer-0.5.3-scripting_api.patch
# PATCH-FIX-UPSTREAM subtitlecomposer-0.5.3-gcc45.patch -- from upstream SVN, remove in next version
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
# PATCH-FIX-UPSTREAM 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
# https://github.com/maxrd2/subtitlecomposer/archive/v0.5.6.tar.gz
Source0: %{name}-%{version}.tar.gz
BuildRequires: fdupes
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: libicu-devel
BuildRequires: libkde4-devel
BuildRequires: libxine-devel
BuildRequires: pkgconfig(gstreamer-0.10)
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
%kde4_runtime_requires
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A text-based subtitles editor that supports basic operations as well as more
@ -58,14 +48,7 @@ every platform supported by KDE.
%prep
%setup -q
%patch0
%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
# Fix permissions
chmod 644 ChangeLog
@ -74,9 +57,7 @@ chmod 644 ChangeLog
%make_jobs
%install
cd build
%kde4_makeinstall
cd ..
%kde4_makeinstall -C build
%if 0%{?suse_version}
%suse_update_desktop_file -r %{name} Qt KDE AudioVideo AudioVideoEditing
@ -99,14 +80,14 @@ rm -rf %{buildroot}%{_kde4_appsdir}/%{name}/scripts/api/
perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroot}%{_kde4_appsdir}/%{name}/scripts/README
%post
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
%mime_database_post
%postun
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
%mime_database_postun
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog TODO files_for_doc/api
%doc AUTHORS COPYING ChangeLog README.md TODO files_for_doc/api
%{_kde4_bindir}/%{name}
%{_kde4_applicationsdir}/%{name}.desktop
%{_kde4_appsdir}/%{name}/