rpms/khmeros-fonts/devel import.log, 1.2, 1.3 khmeros-fonts.spec, 1.2, 1.3

[Michal Nowak]

Author: mnowak

Update of /cvs/pkgs/rpms/khmeros-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635/devel

Modified Files:
	import.log khmeros-fonts.spec 
Log Message:
provide Obsoletes and dependency on -common pkg



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Jan 2009 12:37:12 -0000	1.2
+++ import.log	25 Jan 2009 14:02:52 -0000	1.3
@@ -1,2 +1,3 @@
 khmeros-fonts-5_0-3_fc9:HEAD:khmeros-fonts-5.0-3.fc9.src.rpm:1215764336
 khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232800449
+khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232892078


Index: khmeros-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/khmeros-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- khmeros-fonts.spec	24 Jan 2009 12:37:12 -0000	1.2
+++ khmeros-fonts.spec	25 Jan 2009 14:02:52 -0000	1.3
@@ -30,23 +30,22 @@
 %common_desc
 
 
-#%package common
-#Summary:        Common files of %{name}
-#Group:          User Interface/X
-#Requires:       fontpackages-filesystem
-#
-#%description common
-#%common_desc
-#
-#This package consists of files used by other %{name} packages.
+%package common
+Summary:        Common files of %{name}
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
 
 
 %package -n %{fontname}-base-fonts
 Summary:        Base KhmerOS font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
-#Obsoletes:      khmeros-fonts-base <= %{version}-3
-#Provides:       khmeros-fonts-base-%{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-base < 5.0-4
 
 %description -n %{fontname}-base-fonts
 %common_desc
@@ -58,7 +57,8 @@
 %package -n %{fontname}-battambang-fonts
 Summary:        Battambang font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-battambang < 5.0-4
 
 %description -n %{fontname}-battambang-fonts
 %common_desc
@@ -70,7 +70,8 @@
 %package -n %{fontname}-bokor-fonts
 Summary:        Bokor font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-bokor < 5.0-4
 
 %description -n %{fontname}-bokor-fonts
 %common_desc
@@ -82,7 +83,8 @@
 %package -n %{fontname}-handwritten-fonts
 Summary:        Freehand and fasthand fonts
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-handwritten < 5.0-4
 
 %description -n %{fontname}-handwritten-fonts
 %common_desc
@@ -94,7 +96,8 @@
 %package -n %{fontname}-metal-chrieng-fonts
 Summary:        Metal Chrieng font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-metalchrieng < 5.0-4
 
 %description -n %{fontname}-metal-chrieng-fonts
 %common_desc
@@ -106,7 +109,8 @@
 %package -n %{fontname}-muol-fonts
 Summary:        Muol fonts - normal, light and Pali
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-muol < 5.0-4
 
 %description -n %{fontname}-muol-fonts
 %common_desc
@@ -118,7 +122,8 @@
 %package -n %{fontname}-siemreap-fonts
 Summary:        Siemreap font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-siemreap < 5.0-4
 
 %description -n %{fontname}-siemreap-fonts
 %common_desc
@@ -163,9 +168,9 @@
 rm -rf %{buildroot}
 
 
-#%files common
-#%defattr(0644,root,root,0755)
-#%dir %{_fontdir}
+%files common
+%defattr(0644,root,root,0755)
+%dir %{_fontdir}
 
 
 %changelog