[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ntfs-config/EL-5 ntfs-config.spec,1.4,1.5



Author: laxathom

Update of /cvs/pkgs/rpms/ntfs-config/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15955/EL-5

Modified Files:
	ntfs-config.spec 
Log Message:



Index: ntfs-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntfs-config/EL-5/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:23:20 -0000	1.4
+++ ntfs-config.spec	20 May 2007 01:07:42 -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
+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,15 +92,23 @@
 %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 gmail com> - 1.0-0.1.beta1
+- Updated Release.
+- Fixed missing mkinstalldir from Makefile.
+
 * Sun Mar 25 2007 Xavier Lamien <lxtnow gmail com> - 0.5.5-3
 - Fixed default permission for executable file.
 - Updated url source from upstream.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]