[fedora-extras-commits] rpms/apt/devel apt.spec,1.3,1.4

[Michael Schwendt (mschwendt)]

Update of /cvs/extras/rpms/apt/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv2918

Modified Files:
	apt.spec 
Log Message:
Only fix build for FC3 (other updates necessary - see spec changelog).



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apt.spec	8 Nov 2004 04:04:43 -0000	1.3
+++ apt.spec	10 Nov 2004 03:05:28 -0000	1.4
@@ -10,7 +10,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 0.fdr.11.2
+Release: 11
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -28,8 +28,7 @@
 Source4: apt_preferences
 
 # rpmpriorities generated from comps.xml base group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
+Source5: rpmpriorities
 
 # Sources 50-99 are for Lua-scripts
 Source50: gpg-checker.lua
@@ -75,7 +74,7 @@
 # for version detection to work 
 BuildRequires: fedora-release
 
-%if "%{rpmver}" == "4.3.1"
+%if "%{rpmver}" >= "4.3.1"
 BuildRequires: libselinux-devel
 %endif
 
@@ -166,7 +165,7 @@
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -p -m 644 $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities
 
 # install config parts
 for cnf in %{SOURCE150} %{SOURCE151}; do
@@ -267,6 +266,13 @@
 %{_libdir}/python%{pythonver}/site-packages/*
 
 %changelog
+* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.5.15cnc6-11
+- TODO: Somebody with access to www.fedora.us would need to update
+  Source151 (mirror-select.conf) and update it for FC3.
+- Only make this build for FC3 (fix installation of rpmpriorities file
+  and fixed the inaccurate conditional BR libselinux-devel which could
+  be made unconditional).
+
 * Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.11
 - revert the ctrl-c workaroound, the "cure" is worse than the disease