rpms/k3b/devel k3b-1.0.5-hidden.patch, 1.2, 1.3 k3b.spec, 1.64, 1.65 k3b-i18n-0.12.17-rellink.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Thu Aug 28 13:46:00 UTC 2008
- Previous message (by thread): rpms/collectd/EL-5 collectd.spec,1.13,1.14
- Next message (by thread): rpms/perl/F-8 perl-5.8.8-U31996.patch, NONE, 1.1 perl-5.8.8-U32018.patch, NONE, 1.1 perl-5.8.8-U32019.patch, NONE, 1.1 perl-5.8.8-U32025.patch, NONE, 1.1 perl-5.8.0-sharedlinker.patch, 1.1, 1.2 perl-5.8.8-U28775.patch, 1.1, 1.2 perl.spec, 1.152, 1.153
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19029
Modified Files:
k3b-1.0.5-hidden.patch k3b.spec
Removed Files:
k3b-i18n-0.12.17-rellink.patch
Log Message:
* Wed Aug 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-5
- resurrect -devel (!=f9), grow -libs (f10+, #341651)
- avoid auto*foo
- fix build on rawhide (libdvdread header changes)
- conditionalize i18n bits
k3b-1.0.5-hidden.patch:
Index: k3b-1.0.5-hidden.patch
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b-1.0.5-hidden.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-1.0.5-hidden.patch 30 Jun 2008 15:28:22 -0000 1.2
+++ k3b-1.0.5-hidden.patch 28 Aug 2008 13:45:30 -0000 1.3
@@ -1,6 +1,22 @@
+diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
+--- k3b-1.0.5/src/Makefile.in.hidden 2008-05-27 03:34:44.000000000 -0500
++++ k3b-1.0.5/src/Makefile.in 2008-08-27 14:18:54.000000000 -0500
+@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
+ -lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
+
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+-xdg_apps_DATA = k3b.desktop
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
++#silent_DATA = k3b-iso.desktop k3b-cue.desktop
++#silentdir = $(kde_appsdir)/.hidden/
+
+ ###################
+ # this 10 paths are KDE specific. Use them:
diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
--- k3b-1.0.5/src/Makefile.am.hidden 2008-05-27 03:24:04.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.am 2008-06-30 09:29:58.000000000 -0500
++++ k3b-1.0.5/src/Makefile.am 2008-08-27 14:13:36.000000000 -0500
@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- k3b.spec 31 Jul 2008 13:23:44 -0000 1.64
+++ k3b.spec 28 Aug 2008 13:45:30 -0000 1.65
@@ -4,45 +4,52 @@
%define _with_hal --with-hal
%endif
-%if 0%{?fedora} > 8
+# only F-9 shipped without -devel, fixme?
+%if 0%{?fedora} != 9
# include -devel subpkg or not? 1=yes
-%else
%define devel 1
%endif
+%if 0%{?fedora} > 9
+# -libs subpkg
+%define libs 1
+%endif
+
+# build/include i18n
+%define i18n 1
+
Name: k3b
Summary: CD/DVD burning application for KDE
Epoch: 0
Version: 1.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Applications/Archiving
License: GPLv2+
URL: http://www.k3b.org
Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
-Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
+%{?i18n:Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# TODO: bugzilla/document
ExcludeArch: s390 s390x
Source2: k3brc
-Patch1: k3b-i18n-0.12.17-rellink.patch
Patch2: k3b-1.0.3-umount.patch
+# manual bufsize (upstream?)
Patch4: k3b-1.0.4-manualbufsize.patch
-# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
-Patch5: k3b-1.0.5-hidden.patch
# upstream patches
# http://bugs.kde.org/151816 , k3b can't reload media for verification
Patch100: k3b-1.0.4-kde#151816.patch
# http://bugs.kde.org/156684 , alternative to patch100
Patch101: k3b-1.0.5-kde#156684.patch
+# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
+# upstreamed 2008-08-27
+Patch105: k3b-1.0.5-hidden.patch
BuildRequires: kdelibs3-devel
BuildRequires: desktop-file-utils
-# needed by patch1
-BuildRequires: automake libtool
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
@@ -59,16 +66,28 @@
Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
Provides: k3b-extras = %{epoch}:%{version}-%{release}
+%if 0%{?i18n}
# imo, should be packaged separately, tis a shame to duplicate all
# this noarch build/data on *every* arch. -- Rex
Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
+%endif
%if ! 0%{?devel}
Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
%endif
-Requires(post): /sbin/ldconfig coreutils
-Requires(postun): /sbin/ldconfig coreutils
+Requires(post): coreutils
+Requires(postun): coreutils
+
+%if 0%{?libs}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%else
+#Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
+Provides: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
Requires: cdrecord mkisofs
%if 0%{?fedora} > 3
Requires(hint): cdrdao
@@ -83,35 +102,38 @@
automatic settings and the reasonable k3b defaults which allow a quick
start.
-%if 0%{?devel}
-# afaik, nobody BR's it, and it pulls k3b into multilib.
-# when/if this is ever needed, consider -libs subpkg -- Rex
+%package libs
+Summary: Runtime libraries for %{name}
+Group: System Environment/Libraries
+# be paranoid -- Rex
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%description libs
+%{summary}.
+
%package devel
Summary: Files for the development of applications which will use %{name}
Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description devel
%{summary}.
-%endif
%prep
-%setup -q -a 1 -n %{name}-%{version}
+%setup -q %{?i18n:-a 1} -n %{name}-%{version}
%patch2 -p1 -b .umount
-# set in k3brc instead
-#patch4 -p1 -b .manualbufsize
-%patch5 -p1 -b .hidden
+# set in k3brc too
+%patch4 -p1 -b .manualbufsize
#patch100 -p1 -b .kde#151816
%patch101 -p1 -b .kde#156684
+%patch105 -p1 -b .hidden
-make -f admin/Makefile.common
-
-pushd %{name}-i18n-%{version}
-%patch1 -p2 -b .lns
-make -f admin/Makefile.common
-popd
+# FIXME? -- Rex
+%if 0%{?fedora} > 9
+sed -i.libdvdread -e 's|dvdread/|libdvdread/|' \
+ libk3b/videodvd/configure.in.in libk3b/videodvd/k3bvideodvd.cpp configure
+%endif
%build
@@ -128,6 +150,7 @@
--with-oggvorbis \
--with-flac \
--with-external-libsamplerate \
+ --with-libdvdread \
--with-musicbrainz \
--with-sndfile \
--without-ffmpeg --without-lame --without-libmad \
@@ -136,69 +159,88 @@
make %{?_smp_mflags}
+%if 0%{?i18n}
# Build for i18n tarball
pushd %{name}-i18n-%{version}
%configure
make %{?_smp_mflags}
popd
+%endif
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+%if 0%{?i18n}
# Install for i18n tarball
pushd %{name}-i18n-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
popd
+%endif
-%{__install} -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
+%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
desktop-file-install --vendor="" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+ --dir %{buildroot}%{_datadir}/applications/kde \
+ %{buildroot}%{_datadir}/applications/kde/*.desktop
# remove the .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la
+rm -f %{buildroot}%{_libdir}/libk3b*.la
# remove i18n for Plattdeutsch (Low Saxon)
-rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/nds
+rm -fr %{buildroot}%{_datadir}/locale/nds
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/k3b/common
-ln -s ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/k3b/common
-
-pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML
-for i in *; do
- test -d $i && mkdir $i/common 2>/dev/null
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+ if [ -d $lang_dir ]; then
+ lang=$(basename $lang_dir)
+ echo "%lang($lang) $HTML_DIR/$lang/*" >> all.lang
+ # replace absolute symlinks with relative ones
+ pushd $lang_dir
+ for i in *; do
+ [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+ done
+ popd
+ fi
done
-popd
+fi
+%if 0%{?i18n}
%find_lang k3b
%find_lang k3bsetup
%find_lang libk3b
%find_lang libk3bdevice
-
cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
+%endif
# unpackaged files
%if ! 0%{?devel}
-rm -rf $RPM_BUILD_ROOT%{_includedir}/k3b/
-rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.so
+rm -rf %{buildroot}%{_includedir}/k3b/
+rm -f %{buildroot}%{_libdir}/libk3b*.so
%endif
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
%post
-/sbin/ldconfig
+%{?!libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
%postun
-/sbin/ldconfig
+%{?!libs:/sbin/ldconfig}
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
@@ -210,7 +252,6 @@
%{_bindir}/k3b
%{_datadir}/applications/kde/*.desktop
%{_datadir}/mimelnk/application/x-k3b.desktop
-%{_libdir}/libk3b*.so.*
%{_libdir}/kde3/*.so
%{_libdir}/kde3/*.la
@@ -224,21 +265,11 @@
%{_datadir}/sounds/*
%{_datadir}/icons/hicolor/*/*/*
-# files from i18n
-%lang(da) %{_docdir}/HTML/da/%{name}/*
-%lang(de) %{_docdir}/HTML/de/%{name}/*
-%lang(en) %{_docdir}/HTML/en/%{name}/*
-%lang(es) %{_docdir}/HTML/es/%{name}/*
-%lang(et) %{_docdir}/HTML/et/%{name}/*
-%lang(fr) %{_docdir}/HTML/fr/%{name}/*
-%lang(it) %{_docdir}/HTML/it/%{name}/*
-%lang(nl) %{_docdir}/HTML/nl/%{name}/*
-%lang(pt) %{_docdir}/HTML/pt/%{name}/*
-%lang(pt_BR) %{_docdir}/HTML/pt_BR/%{name}/*
-%lang(ru) %{_docdir}/HTML/ru/%{name}/*
-%lang(sv) %{_docdir}/HTML/sv/%{name}/*
-%lang(uk) %{_docdir}/HTML/uk/%{name}/*
-%lang(pl) %{_docdir}/HTML/pl/%{name}/*
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libk3b*.so.*
%if 0%{?devel}
%files devel
@@ -249,6 +280,12 @@
%changelog
+* Wed Aug 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-5
+- resurrect -devel (!=f9), grow -libs (f10+, #341651)
+- avoid auto*foo
+- fix build on rawhide (libdvdread header changes)
+- conditionalize i18n bits
+
* Thu Jul 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-4
- try alternative fix for tray eject/reload (kde#156684)
--- k3b-i18n-0.12.17-rellink.patch DELETED ---
- Previous message (by thread): rpms/collectd/EL-5 collectd.spec,1.13,1.14
- Next message (by thread): rpms/perl/F-8 perl-5.8.8-U31996.patch, NONE, 1.1 perl-5.8.8-U32018.patch, NONE, 1.1 perl-5.8.8-U32019.patch, NONE, 1.1 perl-5.8.8-U32025.patch, NONE, 1.1 perl-5.8.0-sharedlinker.patch, 1.1, 1.2 perl-5.8.8-U28775.patch, 1.1, 1.2 perl.spec, 1.152, 1.153
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list