Browse Source

synaptic: fix BTS:1244
scribus: new upstream release

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

Takemikaduchi 13 years ago
parent
commit
da82f5485c
3 changed files with 129 additions and 43 deletions
  1. 108 0
      g/gnome-packagekit/gnome-packagekit-vl.spec
  2. 11 42
      s/scribus/scribus-vl.spec
  3. 10 1
      s/synaptic/synaptic-vl.spec

+ 108 - 0
g/gnome-packagekit/gnome-packagekit-vl.spec

@@ -0,0 +1,108 @@
+Summary:	A PackageKit client for the GNOME desktop
+Name:		gnome-packagekit
+Version:	3.2.1
+Release:	1%{?_dist_release}
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.xz
+License:	GPLv2
+Group:		Applications/Administration
+URL:		http://www.packagekit.org
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:	gtk3-devel
+BuildRequires:	dbus-glib-devel
+BuildRequires:	PackageKit-devel
+BuildRequires:	libgudev1-devel
+BuildRequires:	upower-devel
+BuildRequires:	libcanberra-gtk3-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	gnome-doc-utils
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	Takemikaduchi
+
+
+%description
+gnome-packagekit are PackageKit client programs designed for the GNOME desktop.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure \
+	--disable-static \
+	--disable-scrollkeeper
+
+%{__make} %{?_smp_mflags} 
+
+
+%install
+%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__make} install DESTDIR=${RPM_BUILD_ROOT}
+
+find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+
+%find_lang %{name} --with-gnome
+
+
+%clean
+%{__rm} -rf ${RPM_BUILD_ROOT}
+
+%post
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications >& /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+%postun
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications >& /dev/null ||:
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+fi
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
+
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog NEWS README
+%{_bindir}/gpk-application
+%{_bindir}/gpk-dbus-service
+%{_bindir}/gpk-distro-upgrade
+%{_bindir}/gpk-install-catalog
+%{_bindir}/gpk-install-local-file
+%{_bindir}/gpk-install-mime-type
+%{_bindir}/gpk-install-package-name
+%{_bindir}/gpk-install-provide-file
+%{_bindir}/gpk-log
+%{_bindir}/gpk-prefs
+%{_bindir}/gpk-service-pack
+%{_bindir}/gpk-update-viewer
+%{python_sitelib}/packagekit
+%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/gpk-pk-gtk-module.desktop
+%{_datadir}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
+%{_datadir}/applications/*.desktop
+%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
+%{_datadir}/glib-2.0/schemas/org.gnome.packagekit.gschema.xml
+%{_datadir}/%{name}
+%{_datadir}/icons/hicolor/*/*/*
+%{_mandir}/man1/*.1.gz
+
+
+%changelog
+* Tue Jan 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.1-1
+- initial build for Vine Linux
+

+ 11 - 42
s/scribus/scribus-vl.spec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 Name:           scribus
-Version:        1.3.6
+Version:        1.4.0
 Release:        1%{?_dist_release}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -9,17 +9,7 @@ Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.scribus.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# https://bugzilla.redhat.com/show_bug.cgi?id=506074
-# http://bugs.scribus.net/view.php?id=8232
-Patch0:         %{name}-1.3.5-system-hyphen.patch
-# fix version variable for buildsystem
-Patch1:         %{name}-1.3.6-version.patch
-# fix QString initialization in Qt 4.7
-Patch2:         %{name}-1.3.6-qstring.patch
-# fix linking with --no-add-needed
-Patch3:         %{name}-1.3.6-linker.patch
-# fix build with podofo 0.8.0
-Patch4:         %{name}-1.3.6-podofo-0.8.0.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -78,10 +68,7 @@ Header files for Scribus.
 Summary:        Documentation files for Scribus
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-%if 0%{?fedora} > 9
 BuildArch:      noarch
-Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
-%endif
 
 
 %description    doc
@@ -89,11 +76,6 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .system-hyphen
-%patch1 -p1 -b .version
-%patch2 -p1 -b .qstring
-%patch3 -p1 -b .linker
-%patch4 -p2 -b .podofo
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -142,11 +124,10 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 # install the global desktop file
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/*scribus.desktop
-desktop-file-install --vendor="fedora"                      \
-    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+desktop-file-install					\
+    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications	\
     scribus.desktop
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -161,15 +142,10 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
-%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog
-%doc %{_datadir}/doc/%{name}-%{version}/ChangeLogSVN
-%doc %{_datadir}/doc/%{name}-%{version}/COPYING
-%doc %{_datadir}/doc/%{name}-%{version}/README
-%doc %{_datadir}/doc/%{name}-%{version}/TODO
+%doc AUTHORS ChangeLog ChangeLogSVN COPYING README TODO
 %{_bindir}/%{name}
 %{_libdir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/pixmaps/*
 %{_datadir}/%{name}
@@ -186,21 +162,14 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}
-%lang(cs) %{_datadir}/doc/%{name}-%{version}/cs
-%lang(de) %{_datadir}/doc/%{name}-%{version}/de
-%lang(en) %{_datadir}/doc/%{name}-%{version}/en
-%lang(fr) %{_datadir}/doc/%{name}-%{version}/fr
-%lang(pl) %{_datadir}/doc/%{name}-%{version}/pl
-%{_datadir}/doc/%{name}-%{version}/BUILDING
-%{_datadir}/doc/%{name}-%{version}/NEWS
-%{_datadir}/doc/%{name}-%{version}/README*
-%{_datadir}/doc/%{name}-%{version}/PACKAGING
-%{_datadir}/doc/%{name}-%{version}/LINKS
-%{_datadir}/doc/%{name}-%{version}/TRANSLATION
+%{_datadir}/doc/%{name}
 
 
 %changelog
+* Tue Jan 03 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
+- new upstream release
+- remove old patches
+
 * Tue Jun  1 2010 IWAI, Masaharu <iwai@alib.jp> 1.3.6-1
 - initial build for Vine Linux: based Fedora 1.3.6-4.fc14
 

+ 10 - 1
s/synaptic/synaptic-vl.spec

@@ -1,6 +1,6 @@
 Name: synaptic
 Version: 0.57.2
-Release: 17%{?_dist_release}
+Release: 18%{?_dist_release}
 Summary: GTK based graphical front-end for APT
 Summary(ja): GTK ベースの APT グラフィカルフロントエンド
 Group: Applications/Administration
@@ -36,6 +36,8 @@ Patch26: synaptic-0.57.2-fix-repository-updown.patch
 Patch27: synaptic-0.57.2-fix-crash-on-font-change.patch
 Patch28: synaptic-0.57.2-fix-reinstall.patch
 
+Patch100: synaptic-0.57.2-build-with-rpm-4.9.patch
+
 Requires: apt >= 0.5.15lorg3.93-0vl1
 Requires: usermode >= 1.69
 BuildRequires: bzip2-devel, zlib-devel
@@ -97,6 +99,8 @@ Synaptic は APT(Advanced Package Tool) の Gtk+ ベースのグラフィカル
 %patch27 -p1
 %patch28 -p1
 
+%patch100 -p1
+
 cp -f po/ja.po po/ja.po.orig
 cp -f %{SOURCE10} po/ja.po
 
@@ -105,6 +109,8 @@ cp -f %{SOURCE20} .
 cp -f %{SOURCE30} pixmaps/
 
 %build
+libtoolize --force --copy
+autoconf
 %configure --with-pkg-hold --with-vte --enable-scripts --disable-dependency-tracking
 make -C po update-po
 make %{?_smp_mflags}
@@ -172,6 +178,9 @@ rm -rf %{buildroot}
 %{_mandir}/ja/man8/*
 
 %changelog
+* Wed Jan 04 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.57.2-18
+- add Patch100 (synaptic-0.57.2-build-with-rpm-4.9.patch) (fix <BTS:1244>)
+
 * Thu Dec 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.57.2-17
 - rebuild with rpm-4.9.1.2