rpms/ntfs-config/F-7 ntfs-config.spec,1.4,1.5 sources,1.2,1.3
Xavier LAMIEN (laxathom)
fedora-extras-commits at redhat.com
Sun May 20 01:06:51 UTC 2007
- Previous message (by thread): rpms/ntfs-config/FC-6 ntfs-config.spec,1.4,1.5 sources,1.2,1.3
- Next message (by thread): rpms/gtk2/devel gtk+-2.10.12-search.patch, NONE, 1.1 gtk2.spec, 1.223, 1.224 sources, 1.73, 1.74 gtk+-2.10.8-search.patch, 1.4, NONE raw-printers.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: laxathom
Update of /cvs/pkgs/rpms/ntfs-config/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15897
Modified Files:
ntfs-config.spec sources
Log Message:
Index: ntfs-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-config/F-7/ntfs-config.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ntfs-config.spec 25 Mar 2007 21:28:15 -0000 1.4
+++ ntfs-config.spec 20 May 2007 01:06:16 -0000 1.5
@@ -1,18 +1,24 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
Name: ntfs-config
-Version: 0.5.5
-Release: 3%{?dist}
+Version: 1.0
+Release: 0.1.beta1%{?distv}
Summary: A front-end to Enable/disable NTFS write support
Group: Applications/System
License: GPL
-URL: http://flomertens.free.fr/ntfs-config/
-Source0: http://flomertens.free.fr/ntfs-config/download/%{name}-%{version}.tar.gz
-Source1: %{name}.pam
-Source2: %{name}.consoleapps
+URL: http://flomertens.free.fr/ntfs-config
+Source0: http://flomertens.free.fr/ntfs-config/download/source/%{name}-%{version}-BETA1.tar.gz
+##Added by upstream
+#Source1: %{name}.pam
+#Source2: %{name}.consoleapps
#Patch0: %{name}-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
BuildRequires: gettext, perl-XML-Parser
+BuildRequires: python-devel, pygtk2-devel
Buildrequires: hal-devel, libglade2-devel
BuildRequires: desktop-file-utils
Requires: ntfs-3g
@@ -25,10 +31,14 @@
instead of the current read-only kernel one.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-BETA1
#Remove gksu from .desktop files to match with fedora authentication's program
#%patch0 -p 1 ##applicable for oldest version
-sed -e 's|gksu ntfs-config|ntfs-config|g' -i data/ntfs-config.desktop.in
+#[version 0.5.5] sed -e 's|gksu ntfs-config|ntfs-config|g' -i data/ntfs-config.desktop.in
+
+#Rename to base package name [[experimental]].
+#sed -e 's|%{name}-root|%{name}|g' -i data/pam/Makefile{.am,.in}
+#sed -e 's|$(bindir)/%{name}|$(bindir)/%{name}-root|g' -i data/pam/Makefile{.am,.in}
%build
%configure
@@ -37,9 +47,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+
+#fix missing mkinstalldir from Makefile{.am,.in}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -Dm 644"
@@ -47,24 +57,34 @@
--vendor "" \
--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
--mode 0644 \
+ --remove-category=Application \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+########## Added by upstream in 1.0-beta1.0 ####################
+###
#move ntfs-config executable file in the right location to
#fix rpmlint error.
-mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/
-
+#mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/
+###
+###
#Add PAM authentication to match with fedora authentication's program
-ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-install -Dm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name}
-install -Dm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/%{name}
+#ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name}
+#install -Dm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name}
+#install -Dm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/%{name}
+###
+################################################################
#Fix executable permission
-chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/%{name}
+chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-root
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}
+
+#Remove unneeded file.
+rm -f $RPM_BUILD_ROOT%{_bindir}/consolehelper
%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,21 +92,29 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
-%{_sbindir}/%{name}
+%{_sbindir}/%{name}-root
%{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_bindir}/%{name}-root
+%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_mandir}/man8/%{name}*
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+##removed by upstream :-(
+#%{_mandir}/man8/%{name}*
+%{python_sitelib}/NtfsConfig
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}-root
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}-root
+
%changelog
+* Wed May 16 2007 Xavier Lamien <lxtnow at gmail.com> - 1.0-0.1.beta1
+- Updated Release.
+- Fixed missing mkinstalldir from Makefile.
+
* Sun Mar 25 2007 Xavier Lamien <lxtnow at gmail.com> - 0.5.5-3
- Fixed default permission for executable file.
- Updated url source from upstream.
-* Tue Mar 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.5-2
-- Bump release for FE6 -> Fedora 7 upgrade path.
+* Wed Mar 07 2007 Xavier Lamien <lxtnow at gmail.com> - 0.5.5-2
+- increased release to build in cvs.
* Thu Mar 01 2007 Xavier Lamien <lxtnow at gmail.com> - 0.5.5-1
- Updated release.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-config/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Mar 2007 04:53:51 -0000 1.2
+++ sources 20 May 2007 01:06:16 -0000 1.3
@@ -1 +1 @@
-fb4ce03134752a1d3d0c292a8e8a9a9b ntfs-config-0.5.5.tar.gz
+79d7acd74d5c905c903bf5eb34957da8 ntfs-config-1.0-BETA1.tar.gz
- Previous message (by thread): rpms/ntfs-config/FC-6 ntfs-config.spec,1.4,1.5 sources,1.2,1.3
- Next message (by thread): rpms/gtk2/devel gtk+-2.10.12-search.patch, NONE, 1.1 gtk2.spec, 1.223, 1.224 sources, 1.73, 1.74 gtk+-2.10.8-search.patch, 1.4, NONE raw-printers.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list