From e1ca536d3679cd65b90273a699f49ad0bc485e6a Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Jul 09 2018 18:44:17 +0000 Subject: Updated to 1.4 Modernised the spec file Dropped upstreamed patch and appstream file Dropped obsolete scriptlets --- diff --git a/.gitignore b/.gitignore index 0aa9700..ffc200f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gnome-subtitles-1.0.tar.gz /gnome-subtitles-1.1.tar.gz /gnome-subtitles-1.2.tar.gz /gnome-subtitles-1.3.tar.gz +/gnome-subtitles-1.4.tar.gz diff --git a/gnome-subtitles-1.3-mcs.patch b/gnome-subtitles-1.3-mcs.patch deleted file mode 100644 index f928a8b..0000000 --- a/gnome-subtitles-1.3-mcs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up gnome-subtitles-1.3/configure.ac.mcs gnome-subtitles-1.3/configure.ac ---- gnome-subtitles-1.3/configure.ac.mcs 2016-02-15 08:39:13.510065864 +0100 -+++ gnome-subtitles-1.3/configure.ac 2016-02-15 08:39:56.805439884 +0100 -@@ -35,7 +35,7 @@ fi - - dnl C# compiler - AC_PATH_PROG(CSC, csc, no) --AC_PATH_PROG(MCS, dmcs, no) -+AC_PATH_PROG(MCS, mcs, no) - AC_PATH_PROG(MONO, mono, no) - - CS="C#" -diff -up gnome-subtitles-1.3/configure.mcs gnome-subtitles-1.3/configure ---- gnome-subtitles-1.3/configure.mcs 2016-02-15 08:39:25.206166905 +0100 -+++ gnome-subtitles-1.3/configure 2016-02-15 08:40:37.302789732 +0100 -@@ -13593,8 +13593,8 @@ $as_echo "no" >&6; } - fi - - --# Extract the first word of "dmcs", so it can be a program name with args. --set dummy dmcs; ac_word=$2 -+# Extract the first word of "mcs", so it can be a program name with args. -+set dummy mcs; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_path_MCS+:} false; then : diff --git a/gnome-subtitles.spec b/gnome-subtitles.spec index 288ebe4..877513c 100644 --- a/gnome-subtitles.spec +++ b/gnome-subtitles.spec @@ -1,22 +1,22 @@ Name: gnome-subtitles -Version: 1.3 -Release: 14%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Subtitle editor for Gnome #Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+ License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://gnome-subtitles.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-mcs.patch BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: gnome-doc-utils -BuildRequires: gnome-sharp-devel -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel -BuildRequires: gtk2-devel -BuildRequires: gtk-sharp2-devel +BuildRequires: libappstream-glib +BuildRequires: pkgconfig(mono) +BuildRequires: pkgconfig(gstreamer-video-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk-sharp-3.0) BuildRequires: intltool BuildRequires: mono-devel BuildRequires: perl(XML::Parser) @@ -36,100 +36,44 @@ most common text-based subtitle formats and allows for subtitle editing, translation and synchronization. %prep -%setup -q -%patch0 -p1 -b .mcs +%autosetup %build %configure --disable-schemas-install \ --disable-scrollkeeper -make +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT -%if %{with desktop_vendor_tag} -desktop-file-install --vendor=fedora \ - --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%else +%make_install desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -%endif - -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - gnome-subtitles.desktop - CC0-1.0 - Create subtitles for videos - -

- GNOME Subtitles is an application for creating and editing subtitles - for videos. - It allows you to load up a video file, and create a subtitle - file to go with that video, and tweak the timings of the subtitles. - It supports a wide range of subtitle and video formats. -

- - http://gnome-subtitles.sourceforge.net/ - - http://gnome-subtitles.sourceforge.net/files/screenshots/Screenshot-GnomeSubtitles-VideoTimesTranslation.png - - -EOF +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.xml %find_lang %{name} -%pre -%gconf_schema_prepare %{name} - - -%post -%gconf_schema_upgrade %{name} -update-desktop-database &> /dev/null || : - - -%preun -%gconf_schema_remove %{name} - - -%postun -update-desktop-database &> /dev/null || : - - %files -f %{name}.lang %doc AUTHORS ChangeLog COPYING NEWS README -%{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_libdir}/%{name} -%if %{with desktop_vendor_tag} -%{_datadir}/applications/fedora-%{name}.desktop -%else -%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%endif +%{_datadir}/glib-2.0/schemas/org.gnome.GnomeSubtitles.gschema.xml %{_datadir}/gnome/help/%{name} %{_mandir}/man1/%{name}.1* +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/omf/%{name} %{_datadir}/pixmaps/%{name}.svg %changelog +* Mon Jul 09 2018 Julian Sikorski - 1.4-1 +- Updated to 1.4 +- Modernised the spec file +- Dropped upstreamed patch and appstream file +- Dropped obsolete scriptlets + * Wed Feb 07 2018 Fedora Release Engineering - 1.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 355bbdd..96794ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0570134af6626d4e6c018c5f7774964 gnome-subtitles-1.3.tar.gz +SHA512 (gnome-subtitles-1.4.tar.gz) = 14464def895d7c989a8b25f97acb1bff3c1409db6ceb5c3616600ad033ff3c40a5ccce4a2125be755510b115c9ba4d25417f8463f7f4430aae6cb0b87112fbee