rpms/diradmin/FC-3 .cvsignore, 1.3, 1.4 diradmin.spec, 1.3, 1.4 sources, 1.3, 1.4

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/diradmin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4646/FC-3

Modified Files:
	.cvsignore diradmin.spec sources 
Log Message:
Update FC-3 and FC-4 branches to 1.7.1 too.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/diradmin/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Dec 2004 18:53:46 -0000	1.3
+++ .cvsignore	26 Aug 2005 09:59:17 -0000	1.4
@@ -1,2 +1,2 @@
-directory_administrator-1.5.1.tar.gz
 directory-administrator_1.5.1.0-5.diff.gz
+directory_administrator-1.7.1.tar.gz


Index: diradmin.spec
===================================================================
RCS file: /cvs/extras/rpms/diradmin/FC-3/diradmin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- diradmin.spec	4 Dec 2004 18:53:46 -0000	1.3
+++ diradmin.spec	26 Aug 2005 09:59:17 -0000	1.4
@@ -1,11 +1,11 @@
 Summary: User control management tool for LDAP directories
 Name: diradmin
-Version: 1.5.1
-Release: 5
+Version: 1.7.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://diradmin.open-it.org/
-Source: http://diradmin.open-it.org/directory_administrator-%{version}.tar.gz
+Source: http://diradmin.open-it.org/releases/directory_administrator-%{version}.tar.gz
 Patch: http://ftp.debian.org/debian/pool/main/d/directory-administrator/directory-administrator_1.5.1.0-5.diff.gz
 BuildRoot: %{_tmppath}/%{name}-%{release}-%{version}-root
 BuildRequires: gnome-libs-devel, openldap-devel, desktop-file-utils
@@ -24,11 +24,11 @@
 %prep
 %setup -q -n directory_administrator-%{version}
 %patch -p1
-%{__patch} -p1 < debian/patches/01_modifymail.dpatch
-%{__patch} -p1 < debian/patches/02_englishmessages.dpatch
-%{__patch} -p1 < debian/patches/03_bindaftersetoption.dpatch
-%{__patch} -p1 < debian/patches/04_protectpassword.dpatch
-%{__patch} -p1 < debian/patches/05_gstrconcatnull.dpatch
+#{__patch} -p1 < debian/patches/01_modifymail.dpatch
+#{__patch} -p1 < debian/patches/02_englishmessages.dpatch
+#{__patch} -p1 < debian/patches/03_bindaftersetoption.dpatch
+#{__patch} -p1 < debian/patches/04_protectpassword.dpatch
+#{__patch} -p1 < debian/patches/05_gstrconcatnull.dpatch
 
 
 %build
@@ -40,36 +40,65 @@
 %{__rm} -rf %{buildroot}
 %makeinstall
 
-# Replace desktop file, removing the categories
+# Replace desktop file, removing the categories and updating Icon=
 %{__rm} -f %{buildroot}%{_datadir}/applications/*
 %{__cat} applnk/dragonfear-directory_administrator.desktop \
-  | grep -v ^Categories | grep -v '^$' > %{name}.desktop
+    | grep -v ^Categories | grep -v '^$' \
+    | sed 's|Icon=.*|Icon=diradmin.png|g' \
+    > %{name}.desktop
+
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora          \
-  --dir %{buildroot}%{_datadir}/applications  \
-  --add-category X-Fedora                     \
-  --add-category GNOME                        \
-  --add-category System                       \
-  --add-category Application                  \
-  %{name}.desktop
-%{__install} -Dpm 644 debian/directory_administrator.1 \
-  %{buildroot}%{_mandir}/man1/directory_administrator.1
+desktop-file-install --vendor fedora            \
+    --dir %{buildroot}%{_datadir}/applications  \
+    --add-category X-Fedora                     \
+    --add-category Application                  \
+    --add-category System                       \
+    --add-category GNOME                        \
+    %{name}.desktop
+%{__install} -D -p -m 0644 debian/directory_administrator.1 \
+    %{buildroot}%{_mandir}/man1/directory_administrator.1
+
+# Install provided 48x48 icon
+%{__install} -D -p -m 0644 pixmaps/diradminlogo.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/diradmin.png
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || :
+
+%postun
+gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || :
+
+
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING CREDITS ChangeLog TODO README doc/
 %{_bindir}/directory_administrator
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/directory_administrator
+%{_datadir}/icons/hicolor/48x48/apps/diradmin.png
+%{_datadir}/pixmaps/directory_administrator/
 %{_mandir}/man1/directory_administrator.1*
 
 
 %changelog
+* Wed Aug 24 2005 Matthias Saou <http://freshrpms.net/> 1.7.1-1
+- Update to 1.7.1.
+- No longer apply any of the debian patches but provide them in case someone
+  wants to adapt them for this version.
+
+* Mon Aug  1 2005 Matthias Saou <http://freshrpms.net/> 1.6.0-1
+- Update to 1.6.0.
+- Use %%{?dist} tag.
+- No longer apply Debian patch #3, as the ldap version check as been changed.
+- Move icon to icons/hicolor/ and add gtk-update-icon-cache calls.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.5.1-6
+- rebuilt
+
 * Sat Dec  4 2004 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-5
 - Fix build, %%{desktop_vendor} doesn't exist any more.
 - Bump versioned obsoletes to provide even better Extras upgrade path.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/diradmin/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2004 18:53:46 -0000	1.3
+++ sources	26 Aug 2005 09:59:17 -0000	1.4
@@ -1,2 +1,2 @@
-6ce1d8f2715ed100ec297779e7557d46  directory_administrator-1.5.1.tar.gz
 a627102d486ffd43280d414bfdab3bbc  directory-administrator_1.5.1.0-5.diff.gz
+d417c25765b58629e63daf6238d28ee8  directory_administrator-1.7.1.tar.gz