Hello community, here is the log from the commit of package nautilus-cd-burner checked in at Wed Jan 10 17:51:54 CET 2007. -------- --- GNOME/nautilus-cd-burner/nautilus-cd-burner.changes 2006-11-14 18:10:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/nautilus-cd-burner/nautilus-cd-burner.changes 2007-01-10 13:20:33.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 10 13:20:25 CET 2007 - sbrabec@suse.cz + +- Removed upstreamed icons. + +------------------------------------------------------------------- +Tue Dec 19 12:21:03 CET 2006 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- Old: ---- nautilus-cd-burner-16.png nautilus-cd-burner-22.png nautilus-cd-burner.desktop nautilus-cd-burner.svg New: ---- nautilus-cd-burner-desktop.patch nautilus-cd-burner-old-hal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-cd-burner.spec ++++++ --- /var/tmp/diff_new_pack.W14645/_old 2007-01-10 17:51:12.000000000 +0100 +++ /var/tmp/diff_new_pack.W14645/_new 2007-01-10 17:51:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nautilus-cd-burner (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,26 +11,29 @@ # norootforbuild Name: nautilus-cd-burner -BuildRequires: eel-devel gcc-c++ gnome-mount gnutls-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +BuildRequires: eel-devel gcc-c++ gnutls-devel intltool libgnomeprintui-devel libwnck-devel nautilus-devel update-desktop-files +%if %suse_version > 1010 +BuildRequires: gnome-mount +%endif License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Multimedia/CD/Record -Autoreqprov: on -Requires: nautilus cdrdao cdrecord dvd+rw-tools gnome-icon-theme gnome-mount +Requires: nautilus cdrdao cdrecord dvd+rw-tools gnome-icon-theme +%if %suse_version > 1010 +Requires: gnome-mount +%endif Version: 2.16.1 -Release: 21 +Release: 36 Summary: CD Burning Extension for Nautilus -Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.12/%{name}-%{version}.tar.bz2 -Source1: nautilus-cd-burner.desktop -Source2: nautilus-cd-burner-16.png -Source3: nautilus-cd-burner-22.png -Source4: nautilus-cd-burner.svg +Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.bz2 Patch: nautilus-cd-burner-142860-get-drive-from-desktop-icon.diff +Patch1: nautilus-cd-burner-old-hal.patch +Patch2: nautilus-cd-burner-desktop.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} -PreReq: filesystem gconf2 +Autoreqprov: on + +%gconf_schemas_prereq %description Nautilus-cd-burner is an extension to Nautilus that makes it easy to @@ -69,68 +72,69 @@ %prep %setup #%patch -p1 +%if %suse_version < 1020 +%patch1 +%endif +%patch2 %build -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --libexecdir=%prefix/lib/nautilus \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/%_lib -make +autoreconf -f -i +%configure\ + --libexecdir=%{_prefix}/lib/nautilus-cd-burner +make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/applications/ -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/16x16/apps -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/22x22/apps -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/scalable/apps -cp %SOURCE1 $RPM_BUILD_ROOT%{prefix}/share/applications/nautilus-cd-burner.desktop -cp %SOURCE2 $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/16x16/apps/nautilus-cd-burner.png -cp %SOURCE3 $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/22x22/apps/nautilus-cd-burner.png -cp %SOURCE4 $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg -rm $RPM_BUILD_ROOT%{prefix}/%_lib/gnome-vfs-2.0/modules/*.*a -rm $RPM_BUILD_ROOT%{prefix}/%_lib/nautilus/extensions-1.0/*.*a -%suse_update_desktop_file nautilus-cd-burner +mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps +ln -s ../icons/hicolor/scalable/apps/nautilus-cd-burner.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +%suse_update_desktop_file -N "Gnome CD/DVD Creator" -G "CD/DVD Creator" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-cd-burner %find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a + +%clean +rm -rf $RPM_BUILD_ROOT + +%postun +%run_ldconfig + +%pre -f %{name}.schemas_pre %post %run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/nautilus-cd-burner.schemas >/dev/null -%clean -rm -rf $RPM_BUILD_ROOT +%posttrans -f %{name}.schemas_posttrans -%files -f %{name}.lang +%preun -f %{name}.schemas_preun + +%files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS NEWS README COPYING -%{sysconfdir}/gnome-vfs-2.0/modules/*.conf -#%{sysconfdir}/gconf/schemas/ncb.schemas -%{sysconfdir}/gconf/schemas/nautilus-cd-burner.schemas -%{prefix}/share/nautilus-cd-burner -%{prefix}/share/applications/*.desktop -%{prefix}/share/icons/hicolor/* -%{prefix}/lib/nautilus -%if "%_lib" != "lib" -%{prefix}/%_lib/nautilus -%endif -%{prefix}/%_lib/gnome-vfs-2.0/modules/*.so -%{prefix}/%_lib/*.so.* -%{prefix}/bin/* +%{_bindir}/* +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/*/*.* +%{_datadir}/nautilus-cd-burner +%{_datadir}/pixmaps/*.* +%{_libdir}/*.so.* +%{_libdir}/gnome-vfs-2.0/modules/*.so +%{_libdir}/nautilus/extensions-1.0/*.so +%{_prefix}/lib/nautilus-cd-burner +%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf %files devel %defattr(-, root, root) -%{prefix}/%_lib/*.la -%{prefix}/%_lib/*.so -%{prefix}/%_lib/pkgconfig/libnautilus-burn.pc -%{prefix}/include/libnautilus-burn +%{_includedir}/libnautilus-burn +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/libnautilus-burn.pc %changelog -n nautilus-cd-burner +* Wed Jan 10 2007 - sbrabec@suse.cz +- Removed upstreamed icons. +* Tue Dec 19 2006 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Tue Nov 14 2006 - fejj@suse.de - Removed 160904.patch and made the build depend on gnome-mount since upstream has fixed the issue in a different manner (by ++++++ nautilus-cd-burner-desktop.patch ++++++ --- data/nautilus-cd-burner.desktop.in +++ data/nautilus-cd-burner.desktop.in @@ -3,12 +3,12 @@ _Name=CD/DVD Creator _Comment=Open the CD/DVD Creator TryExec=nautilus-cd-burner -Exec=nautilus --no-desktop burn:/// +Exec=nautilus --no-desktop --browser burn:/// Icon=nautilus-cd-burner Terminal=false StartupNotify=true Type=Application -Categories=GNOME;Core; +Categories=GNOME;Core;Application;AudioVideo;DiscBurning; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=nautilus-cd-burner ++++++ nautilus-cd-burner-old-hal.patch ++++++ --- configure.in +++ configure.in @@ -64,7 +64,7 @@ LIBGNOME_REQUIRED=2.0.0 EEL_REQUIRED=2.13.3 NAUTILUS_REQUIRED=2.15.3 -HAL_REQUIRED=0.5.7 +HAL_REQUIRED=0.5.6 DBUS_REQUIRED=0.6 dnl =========================================================================== ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de