[gnome-subtitles] Updated to 1.3

belegdol belegdol at fedoraproject.org
Tue Apr 2 18:26:32 UTC 2013


commit 4e6520e455fc964c4d3cdbb9f8fb766d93358871
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Tue Apr 2 20:25:58 2013 +0200

    Updated to 1.3
    
    - Updated BRs to gstreamer-1.0
    - De-vendorised the .desktop file

 .gitignore           |    1 +
 gnome-subtitles.spec |   43 ++++++++++++++++++++++++++++++-------------
 sources              |    2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abbfc93..0aa9700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,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
diff --git a/gnome-subtitles.spec b/gnome-subtitles.spec
index 1980aa2..f70e0ae 100644
--- a/gnome-subtitles.spec
+++ b/gnome-subtitles.spec
@@ -1,6 +1,10 @@
+%if 0%{?fedora} && 0%{?fedora} < 19
+%global with_desktop_vendor_tag 1
+%endif
+
 Name:           gnome-subtitles
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Subtitle editor for Gnome
 
 #Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+
@@ -11,8 +15,8 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-doc-utils
 BuildRequires:  gnome-sharp-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gstreamer1-devel
+BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk-sharp2-devel
 BuildRequires:  intltool
@@ -44,15 +48,19 @@ translation and synchronization.
 %build
 %configure --disable-schemas-install \
            --disable-scrollkeeper
-%{__make} %{?_smp_mflags}
+%{__make}
 
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__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
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%endif
 %find_lang %{name}
 
 
@@ -75,18 +83,27 @@ update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas
-%{_bindir}/gnome-subtitles
-%{_libdir}/gnome-subtitles
-%{_datadir}/applications/fedora-gnome-subtitles.desktop
-%{_datadir}/gnome/help/gnome-subtitles
-%{_mandir}/man1/gnome-subtitles.1*
-%{_datadir}/omf/gnome-subtitles
-%{_datadir}/pixmaps/gnome-subtitles.png
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/%{name}
+%{_libdir}/%{name}
+%if %{with desktop_vendor_tag}
+%{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
+%{_datadir}/gnome/help/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_datadir}/omf/%{name}
+%{_datadir}/pixmaps/%{name}.svg
 
 
 
 %changelog
+* Tue Apr 02 2013 Julian Sikorski <belegdol at fedoraproject.org> - 1.3-1
+- Updated to 1.3
+- Updated BRs to gstreamer-1.0
+- De-vendorised the .desktop file
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index b591ed4..355bbdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7f3175b7a189471821d809171121d62  gnome-subtitles-1.2.tar.gz
+b0570134af6626d4e6c018c5f7774964  gnome-subtitles-1.3.tar.gz


More information about the scm-commits mailing list