Changeset from: scop
Update of /cvs/extras/rpms/diradmin/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11380
Modified Files:
.cvsignore diradmin.spec sources
Log Message:
Fix build, merge changes from my version of the package.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:14:02 -0000 1.2
+++ .cvsignore 4 Dec 2004 18:53:46 -0000 1.3
@@ -1 +1,2 @@
directory_administrator-1.5.1.tar.gz
+directory-administrator_1.5.1.0-5.diff.gz
Index: diradmin.spec
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/diradmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- diradmin.spec 11 Nov 2004 19:21:36 -0000 1.2
+++ diradmin.spec 4 Dec 2004 18:53:46 -0000 1.3
@@ -1,14 +1,16 @@
Summary: User control management tool for LDAP directories
Name: diradmin
Version: 1.5.1
-Release: 4
+Release: 5
License: GPL
Group: Applications/System
URL:
http://diradmin.open-it.org/
Source:
http://diradmin.open-it.org/directory_administrator-%{version}.tar.gz
+Patch:
http://ftp.debian.org/debian/pool/main/d/directory-administrator/director...
BuildRoot: %{_tmppath}/%{name}-%{release}-%{version}-root
BuildRequires: gnome-libs-devel, openldap-devel, desktop-file-utils
-Obsoletes: directory_administrator <= 1.3.5
+BuildRequires: openssl-devel
+Obsoletes: directory_administrator <= 1.5.1-4
%description
Directory administrator is a smart LDAP directory management tool. It can be
@@ -20,11 +22,17 @@
%prep
-%setup -n directory_administrator-%{version}
+%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
%build
-%configure
+%configure --disable-dependency-tracking
%{__make} %{?_smp_mflags}
@@ -32,17 +40,20 @@
%{__rm} -rf %{buildroot}
%makeinstall
-
# Replace desktop file, removing the categories
%{__rm} -f %{buildroot}%{_datadir}/applications/*
%{__cat} applnk/dragonfear-directory_administrator.desktop \
- | grep -v ^Categories > %{name}.desktop
+ | grep -v ^Categories | grep -v '^$' > %{name}.desktop
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
- --add-category Application \
+ --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
%clean
@@ -51,13 +62,21 @@
%files
%defattr(-, root, root, 0755)
-%doc AUTHORS NEWS COPYING ChangeLog TODO README doc/
+%doc AUTHORS COPYING CREDITS ChangeLog TODO README doc/
%{_bindir}/directory_administrator
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/directory_administrator
+%{_mandir}/man1/directory_administrator.1*
%changelog
+* 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.
+- BuildRequire openssl-devel to get SSL support built.
+- Merge other misc changes from my version of the same package, which owes
+ quite a bit to Debian.
+
* Wed Nov 10 2004 Matthias Saou <
http://freshrpms.net/> 1.5.1-4
- Bump release to provide Extras upgrade path.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/diradmin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:14:02 -0000 1.2
+++ sources 4 Dec 2004 18:53:46 -0000 1.3
@@ -1 +1,2 @@
6ce1d8f2715ed100ec297779e7557d46 directory_administrator-1.5.1.tar.gz
+a627102d486ffd43280d414bfdab3bbc directory-administrator_1.5.1.0-5.diff.gz