rpms/kdebase/devel .cvsignore, 1.66, 1.67 kdebase.spec, 1.303, 1.304 sources, 1.88, 1.89

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31963

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
- omit multilib upgrade hacks
- omit extraneous BR's

and cleanup epochs.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	28 Mar 2008 16:43:57 -0000	1.66
+++ .cvsignore	28 Mar 2008 18:25:10 -0000	1.67
@@ -1,4 +1 @@
-kdebase-4.0.0.tar.bz2
-kdebase-4.0.1.tar.bz2
-kdebase-4.0.2.tar.bz2
 kdebase-4.0.3.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- kdebase.spec	28 Mar 2008 16:50:50 -0000	1.303
+++ kdebase.spec	28 Mar 2008 18:25:10 -0000	1.304
@@ -10,7 +10,7 @@
 Obsoletes: kdebase4 < %{version}-%{release}
 Provides: kdebase4 = %{version}-%{release}
 
-Obsoletes: %{name}-extras < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # make -libs subpkg
 %define libs 1
@@ -34,12 +34,11 @@
 %endif
 
 %if 0%{?libs}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
-# are these 2 *really* needed? -- Rex
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
-Provides:  %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 %endif
@@ -51,8 +50,6 @@
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
-# needed?
-BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: doxygen
@@ -61,17 +58,10 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-# needed?
-BuildRequires: libart_lgpl-devel
-# needed?
-BuildRequires: libfontenc-devel
 BuildRequires: libusb-devel
 BuildRequires: OpenEXR-devel
-# needed?
-BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-BuildRequires: qimageblitz-devel
 # samba support
 %if 0%{?fedora} > 6 || 0%{?rhel} > 5
 BuildRequires: libsmbclient-devel
@@ -80,17 +70,9 @@
 %endif
 BuildRequires: soprano-devel
 BuildRequires: strigi-devel
-BuildRequires: xine-lib-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-%if 0%{?fedora} >= 8
-BuildRequires:  libxcb-devel
-%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: zlib-devel
-# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
-BuildRequires: gamin-devel giflib-devel libacl-devel pcre-devel
 
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
@@ -101,14 +83,9 @@
 
 %if 0%{?libs}
 %package libs
-Summary: %{name} runtime libraries
+Summary: Runtime libraries for %{name} 
 Group:   System Environment/Libraries
-# helps multilib upgrades? -- Rex
-Obsoletes: kdebase < %{epoch}:%{version}-%{release}
-# are these 2 *really* needed? -- Rex
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
-# include to be paranoid, installing libs-only is untested -- Rex
-Requires: %{name} = %{epoch}:%{version}-%{release}
 %description libs
 %{summary}.
 %endif
@@ -116,7 +93,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name} 
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
@@ -136,12 +113,11 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
@@ -309,6 +285,8 @@
 * Fri Mar 28 2008 Than Ngo <than at redhat.com> 4.0.3-1
 - 4.0.3
 - drop fix for favicons infinite loop, it's included in new version
+- omit multilib upgrade hacks
+- omit extraneous BR's
 
 * Fri Feb 29 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.2-2
 - fix favicons infinite loop


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	28 Mar 2008 16:43:57 -0000	1.88
+++ sources	28 Mar 2008 18:25:10 -0000	1.89
@@ -1 +1 @@
-edff276a45b5348e9fa26924519fabbf  kdebase-4.0.3.tar.bz2
+dff276a45b5348e9fa26924519fabbf  kdebase-4.0.3.tar.bz2