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

reviewed ok Thanks for the updates and fixes.. nice job. One hint though, no need to change the Release: number. Set it to 0. OBS changes it automagically

OBS-URL: https://build.opensuse.org/request/show/58717
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/subtitlecomposer?expand=0&rev=2

scripting_examples_installation.patch

@@ -0,0 +1,11 @@
+--- 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(

subtitlecomposer.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jan 18 18:17:00 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+  * Added a subtitlecomposer-lang package.
+  * Changes based on rpmdevtools templates and spec-cleaner run.
+  * Updates in Buildrequires:, %prep and %install sections.
+  * Fixed rpmlint warnings (devel-file-in-non-devel-package,
+    non-executable-script).
+  * Fixed rpm post build check about directories not owned by a package.
+- Add a patch to fix installation of python scripting examples.
+
 -------------------------------------------------------------------
 Thu Jun 24 08:17:49 UTC 2010 - cmorve69@yahoo.es
 

subtitlecomposer.spec

@@ -1,40 +1,72 @@
+#
+# spec file for package subtitlecomposer
+#
+# Copyright (c) 2011 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
 Name:           subtitlecomposer
 Version:        0.5.3
-Release:        0
+Release:        1
 Summary:        A text-based subtitle editor
+
 License:        GPLv2+
+Url:            http://subcomposer.sourceforge.net/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-URL:            http://subcomposer.sourceforge.net/
+Source0:        %{name}-%{version}.tar.bz2
-Source0:        http://dl.sf.net/sourceforge/subcomposer/%{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM subtitlecomposer-linkage.patch -- from upstream SVN, remove in next version
 Patch0:         %{name}-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
 # PATCH-FIX-UPSTREAM subtitlecomposer-0.5.3-gcc45.patch -- from upstream SVN, remove in next version
 Patch2:         %{name}-%{version}-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
+
+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 libxine-devel
+BuildRequires:  libkde4-devel > 4.2.1
-BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+BuildRequires:  libxine-devel
 %if 0%{?suse_version}
-BuildRequires:  update-desktop-files fdupes
+BuildRequires:  update-desktop-files
 %endif
 %kde4_runtime_requires
+Suggests:       %{name}-lang = %{version}
 
 %description
 A text-based subtitles editor that supports basic operations as well as more
 advanced ones, aiming to become an improved version of Subtitle Workshop for
 every platform supported by KDE.
 
+%lang_package
+
 %prep
 %setup -q
 %patch0
 %patch1
 %patch2
+%patch3
 # 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.png src/main/images/hi96-app-mediaplayer.png
-%{__mv} src/main/images/hi48-app-mediaplayer-closed.png src/main/images/hi64-app-mediaplayer.png
+mv src/main/images/hi48-app-mediaplayer-closed.png src/main/images/hi64-app-mediaplayer.png
+# Fix permissions
+chmod 644 ChangeLog
 
 %build
 %cmake_kde4 -d build
@@ -43,23 +75,39 @@ every platform supported by KDE.
 %install
 cd build
 %kde4_makeinstall
+cd ..
 %if 0%{?suse_version}
-%suse_update_desktop_file -r %{name} 'AudioVideo;AudioVideoEditing;'
+%suse_update_desktop_file -r %{name} Qt KDE AudioVideo AudioVideoEditing
 %endif
-%fdupes -s '%{buildroot}%{_datadir}'
+%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
+# Fix rpmlint warning (devel-file-in-non-devel-package) and install header files as doc (since they are installed just for help)
+mkdir files_for_doc
+cp -a %{buildroot}%{_kde4_appsdir}/%{name}/scripts/api/ files_for_doc/
+rm -rf %{buildroot}%{_kde4_appsdir}/%{name}/scripts/api/
+# Point to the correct path of the header files directory (doc)
+perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroot}%{_kde4_appsdir}/%{name}/scripts/README
 
 %clean
-%{__rm} -rf '%{buildroot}'
+rm -rf %{buildroot}
 
-%files -f build/%{name}.lang
+%files
-%defattr(0644, root, root, 0755)
+%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
+%doc AUTHORS COPYING ChangeLog TODO files_for_doc/api
-%attr(755, root, root) %{_bindir}/%{name}
+%{_bindir}/%{name}
-%{_kde_share_dir}/apps/%{name}
+%{_kde4_applicationsdir}/%{name}.desktop
-%{_kde_config_dir}/%{name}rc
+%{_kde4_appsdir}/%{name}/
-%{_datadir}/applications/kde4/%{name}.desktop
+%{_kde4_configdir}/%{name}rc
+%dir %{_datadir}/icons/hicolor/96x96
+%dir %{_datadir}/icons/hicolor/96x96/apps
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/mime/packages/%{name}.xml
 
+%files lang -f %{name}.lang
+%defattr(-,root,root,-)
+
 %changelog