rpms/libxfce4ui/devel libxfce4ui.spec,1.5,1.6
Christoph Wickert
cwickert at fedoraproject.org
Tue Jul 27 17:40:10 UTC 2010
Author: cwickert
Update of /cvs/pkgs/rpms/libxfce4ui/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10778/devel
Modified Files:
libxfce4ui.spec
Log Message:
* Tue Jul 27 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-2
- Fix file conflict with libxfce4gui (#618719)
Index: libxfce4ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4ui/devel/libxfce4ui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libxfce4ui.spec 25 May 2010 11:12:25 -0000 1.5
+++ libxfce4ui.spec 27 Jul 2010 17:40:10 -0000 1.6
@@ -2,7 +2,7 @@
Name: libxfce4ui
Version: 4.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Commonly used Xfce widgets
Group: System Environment/Libraries
@@ -22,6 +22,8 @@ BuildRequires: startup-notification-dev
BuildRequires: glade3-libgladeui-devel >= 3.5.0
BuildRequires: gettext
BuildRequires: intltool
+# FIXME: remove after libxfcegui4 -> libxfce4ui transition
+Requires: libxfcegui4
# do this later
#Provides: libxfcegui4 = %{version}
@@ -73,6 +75,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%find_lang %{name}
+# to fix the file conflict, remove after libxfcegui4 -> libxfce4ui transition
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4
%clean
rm -rf $RPM_BUILD_ROOT
@@ -86,7 +90,8 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS
-%config(noreplace) %{_sysconfdir}/xdg/xfce4
+# FIXME: re-enable after libxfcegui4 -> libxfce4ui transition
+#%config(noreplace) %{_sysconfdir}/xdg/xfce4
%{_libdir}/*.so.*
%files devel
@@ -102,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 27 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-2
+- Fix file conflict with libxfce4gui (#618719)
+
* Fri May 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
- Update to 4.7.2
More information about the scm-commits
mailing list