rpms/k3b/F-8 .cvsignore, 1.18, 1.19 k3b.spec, 1.48, 1.49 sources, 1.19, 1.20
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Nov 26 17:54:03 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/k3b/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7833
Modified Files:
.cvsignore k3b.spec sources
Log Message:
sync w/devel: k3b-1.0.4, try rebuild to fix "FLAC crash" #382341
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-8/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 27 Jul 2007 20:03:41 -0000 1.18
+++ .cvsignore 26 Nov 2007 17:53:26 -0000 1.19
@@ -1,2 +1,2 @@
-k3b-1.0.3.tar.bz2
-k3b-i18n-1.0.3.tar.bz2
+k3b-i18n-1.0.4.tar.bz2
+k3b-1.0.4.tar.bz2
Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-8/k3b.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- k3b.spec 17 Aug 2007 12:31:22 -0000 1.48
+++ k3b.spec 26 Nov 2007 17:53:26 -0000 1.49
@@ -4,17 +4,23 @@
%define _with_hal --with-hal
%endif
+%if 0%{?fedora} > 8
+# include -devel subpkg or not? 1=yes
+%else
+%define devel 1
+%endif
+
Name: k3b
Summary: CD/DVD burning application for KDE
Epoch: 0
-Version: 1.0.3
+Version: 1.0.4
Release: 3%{?dist}
Group: Applications/Archiving
License: GPLv2+
URL: http://www.k3b.org
-Source0: http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
-Source1: http://dl.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
+Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
+Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
Source2: k3brc
Patch1: k3b-i18n-0.12.17-rellink.patch
@@ -61,6 +67,8 @@
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 -- Rex
%package devel
Summary: Files for the development of applications which will use k3b
Group: Development/Libraries
@@ -68,6 +76,7 @@
%description devel
Files for the development of applications, which will use k3b.
+%endif
%prep
@@ -149,6 +158,13 @@
cat k3bsetup.lang libk3b.lang libk3bdevice.lang >> %{name}.lang
+# unpackaged files
+%if ! 0%{?devel}
+rm -rf $RPM_BUILD_ROOT%{_includedir}/k3b/
+rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.so
+%endif
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -205,16 +221,24 @@
%lang(uk) %doc %{_docdir}/HTML/uk/*
%lang(pl) %doc %{_docdir}/HTML/pl/*
-# devel subpackage
+%if 0%{?devel}
%files devel
%defattr(-,root,root,755)
%doc %{name}-i18n-%{version}/README
%doc %{name}-i18n-%{version}/COPYING
%{_includedir}/k3b/
%{_libdir}/libk3b*.so
+%endif
%changelog
+* Wed Nov 21 2007 Adam Tkac <atkac redhat com> - 0:1.0.4-3
+- rebuild against new libdvdread
+
+* Mon Nov 05 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 0:1.0.4-2
+- k3b-1.0.4
+- omit -devel subpkg (f9+), fixes multiarch conflicts (#341651)
+
* Fri Aug 17 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.3-3
- changed license tag to GPLv2+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 27 Jul 2007 20:03:41 -0000 1.19
+++ sources 26 Nov 2007 17:53:26 -0000 1.20
@@ -1,2 +1,2 @@
-ca9b761045cac9aeccdf1b941a310996 k3b-1.0.3.tar.bz2
-d4c73557e045c3ade04e7fecd63923a0 k3b-i18n-1.0.3.tar.bz2
+27833d12b8e9438eb7a10c5ab330fee1 k3b-i18n-1.0.4.tar.bz2
+42538ddae0809707d3bcdbe0a6ed6a43 k3b-1.0.4.tar.bz2
More information about the scm-commits
mailing list