Browse Source

goobox: new upstream release
audit: fix spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9488 ec354946-7b23-47d6-9f5a-488ba84defc7

Takemikaduchi 9 years ago
parent
commit
915a716dec
2 changed files with 28 additions and 19 deletions
  1. 5 2
      a/audit/audit-vl.spec
  2. 23 17
      g/goobox/goobox-vl.spec

+ 5 - 2
a/audit/audit-vl.spec

@@ -1,12 +1,12 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define sca_version 0.4.10
-%define sca_release 2
+%define sca_release 4
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.7.18
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -300,6 +300,9 @@ fi
 %endif
 
 %changelog
+* Sun Apr 05 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.18-4
+- fix sca_release
+
 * Sun Apr 05 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.18-3
 - create compat32-audit-libs subpackage
 

+ 23 - 17
g/goobox/goobox-vl.spec

@@ -1,4 +1,4 @@
-%define pkg_version 3.0.0
+%define pkg_version 3.3.3
 %define pkg_release 1%{?_dist_release}
 
 Summary:	A Compact Disk Player and Ripper for GNOME
@@ -7,26 +7,24 @@ Name:		goobox
 Version:	%{pkg_version}
 Release:	%{pkg_release}
 
-Source0:	http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.xz
-
-Patch0:		goobox-3.0.0-makefile.patch
+Source0:	http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz
 
 License:	GPLv2
 Group:		Applications/Multimedia
 URL:		http://people.gnome.org/~paobac/goobox/  
 
-Requires(post,postun):	glib2
-Requires(post,postun):	desktop-file-utils
+Requires(posttrans,postun):	glib2
+Requires(posttrans,postun):	desktop-file-utils
 
 BuildRequires:	gtk3-devel 
 BuildRequires:	GConf2-devel 
-BuildRequires:	gstreamer-devel
-BuildRequires:	libmusicbrainz3-devel
+BuildRequires:	gstreamer1-devel
+BuildRequires:	libmusicbrainz5-devel
 BuildRequires:	libdiscid-devel
 BuildRequires:	brasero-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	libSM-devel
-BuildRequires:	gnome-doc-utils
+BuildRequires:	itstool
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -44,7 +42,8 @@ Goobox は GNOME 環境で統合された CD プレイヤ・リッパーです
 
 %prep
 %setup -q
-%patch0 -p1
+sed -i "s|LDFLAGS = @LDFLAGS@|LDFLAGS = @LDFLAGS@ -lm|" Makefile.in
+sed -i "s|LDFLAGS = @LDFLAGS@|LDFLAGS = @LDFLAGS@ -lm|" src/Makefile.in
 
 %build
 %configure --disable-static
@@ -62,19 +61,19 @@ Goobox は GNOME 環境で統合された CD プレイヤ・リッパーです
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %post
-update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor
 if [ $1 -eq 0 ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
   glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 fi
 
 %posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
@@ -83,13 +82,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %doc COPYING ChangeLog NEWS README
 %{_bindir}/goobox
 %{_datadir}/GConf/gsettings/goobox.convert
+%{_datadir}/appdata/goobox.appdata.xml
 %{_datadir}/applications/goobox.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.Goobox.gschema.xml
-%{_datadir}/goobox/ui/*.ui
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 
 %changelog
+* Sun Apr 05 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.3.3-1
+- new upstream release
+- remove Patch0
+- change BuildRequires: gstreamer1-devel instead of gstreamer-devel
+- change BuildRequires: libmusicbrainz5-devel instead of libmusicbrainz3-devel
+- add BuildRequires: itstool
+
 * Thu Oct 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.0-1
 - initial build for Vine Linux