[gnome-mag/f14/master] fix spec

Matthias Clasen mclasen at fedoraproject.org
Thu Sep 30 00:41:47 UTC 2010


commit 4aa462d8d25f58f6e03fc0bbe3d3dba66c3ec884
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 29 20:41:04 2010 -0400

    fix spec

 gnome-mag.spec |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/gnome-mag.spec b/gnome-mag.spec
index b1cf300..9286787 100644
--- a/gnome-mag.spec
+++ b/gnome-mag.spec
@@ -1,5 +1,3 @@
-%define po_package gnome-mag
-
 Summary: Screen magnifier for GNOME
 Name: gnome-mag
 Version: 0.16.2
@@ -51,20 +49,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -name '*.la' |xargs /bin/rm
 
-<<<<<<< HEAD
-%find_lang %{po_package}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-=======
 %find_lang %{name}
->>>>>>> 9a11fc5... 0.16.2
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%files -f %{po_package}.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS README NEWS COPYING
 %{_bindir}/magnifier


More information about the scm-commits mailing list